Delivery: quieten smtp transport conn reuse vs. delivery race. Bug 1810

[users/heiko/exim.git] / test / confs / 5400

diff --git a/test/confs/5400 b/test/confs/5400
index 62466983c2884568e277583712200e6207e54eb9..8cf757768a74b44cb0f9032efe410e93113f3230 100644 (file)
--- a/test/confs/5400
+++ b/test/confs/5400
@@ -1,13 +1,16 @@
 # Exim test configuration 5400
 
 exim_path = EXIM_PATH
 # Exim test configuration 5400
 
 exim_path = EXIM_PATH

+keep_environment =

 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s

 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME

+tls_advertise_hosts =
+
+log_selector = +received_recipients

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -28,14 +31,21 @@ ar:
 
 begin routers
 
 
 begin routers
 

+dns:
+  driver = dnslookup
+  domains = localhost.test.ex : localhost4.test.ex : thishost.test.ex
+  self = send
+  transport = smtp
+

 all:
   driver = manualroute
   domains = ! +local_domains
 all:
   driver = manualroute
   domains = ! +local_domains

-  route_list = * 127.0.0.1
+  route_list = special.com HOSTIPV4 ; * 127.0.0.1

   self = send
   self = send

-  transport = smtp
+  transport = ${if eq {special_tpt}{$local_part} {smtp2}{smtp}}

   headers_remove = X-hdr-rtr
   headers_add =    X-hdr-rtr-new: $h_X-hdr-rtr:+++
   headers_remove = X-hdr-rtr
   headers_add =    X-hdr-rtr-new: $h_X-hdr-rtr:+++

+  errors_to =     ""

   no_more
 
 
   no_more
 
 


@@ -49,5 +59,10 @@ smtp:
   port = PORT_S
   headers_add =  ${if def:h_X-hdr-rtr {X-hdr-tpt-new: new} {}}
 
   port = PORT_S
   headers_add =  ${if def:h_X-hdr-rtr {X-hdr-tpt-new: new} {}}
 

+smtp2:
+  driver = smtp
+  interface = HOSTIPV4
+  port = PORT_S
+

 
 # End
 
 # End