Fix ${readsocket } eol-replacement. Bug 2630

[exim.git] / test / confs / 0604

diff --git a/test/confs/0604 b/test/confs/0604
index 80c130cbe08b2f7a330cd3e95b525f3fbfc261a1..13ad0c2c76a6f1777b266a0f32a582a03ae60f69 100644 (file)
--- a/test/confs/0604
+++ b/test/confs/0604
@@ -6,17 +6,10 @@ untrusted_set_sender = *
 
 SERVER =
 
 
 SERVER =
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-#primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+

 rfc1413_query_timeout = 0s
 rfc1413_query_timeout = 0s

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-log_selector = +sender_on_delivery
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+log_selector = +sender_on_delivery +millisec

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


@@ -49,6 +42,7 @@ send_to_server:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D

+  hosts_try_fastopen = :

   # assumes that HOSTIPV4 can sent to 127.0.0.1
   interface = ${if eq {$sender_address_domain}{dustybelt.tld} {127.0.0.1}{HOSTIPV4}}
 
   # assumes that HOSTIPV4 can sent to 127.0.0.1
   interface = ${if eq {$sender_address_domain}{dustybelt.tld} {127.0.0.1}{HOSTIPV4}}