git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Delivery: quieten smtp transport conn reuse vs. delivery race. Bug 1810
[users/heiko/exim.git]
/
test
/
confs
/
0548
diff --git
a/test/confs/0548
b/test/confs/0548
index 18ef2abdd4d8a40048fed6c9ab46d72522564c9d..f0f418958cbd5478016655825960e8347cffaf43 100644
(file)
--- a/
test/confs/0548
+++ b/
test/confs/0548
@@
-3,18
+3,20
@@
SERVER=
exim_path = EXIM_PATH
SERVER=
exim_path = EXIM_PATH
+keep_environment =
host_lookup_order = bydns
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
+tls_advertise_hosts =
# ----- Main settings -----
acl_smtp_connect = acl_connect
acl_smtp_rcpt = acl_rcpt
qualify_domain = test.ex
# ----- Main settings -----
acl_smtp_connect = acl_connect
acl_smtp_rcpt = acl_rcpt
qualify_domain = test.ex
+queue_run_in_order
# ----- ACLs -----
# ----- ACLs -----
@@
-54,7
+56,7
@@
smtp:
begin retry
begin retry
-thishost.test.ex * F,
15s,1
s
+thishost.test.ex * F,
20s,2
s
* * F,1s,1s; F,1s,5s
# End
* * F,1s,1s; F,1s,5s
# End