Merge branch '4.next'

[exim.git] / test / confs / 0495

diff --git a/test/confs/0495 b/test/confs/0495
index bb7c5e332f3764cbff580e61192b2b6413987173..dc1a394b0a4c3f82d031fab9a98676a03ca214a2 100644 (file)
--- a/test/confs/0495
+++ b/test/confs/0495
@@ -1,13 +1,8 @@
 # Exim test configuration 0495
 
 # Exim test configuration 0495
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

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

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


@@ -69,6 +64,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   command_timeout = 1s
 
   allow_localhost
   command_timeout = 1s
 


@@ -76,6 +72,7 @@ t2:
   driver = smtp
   hosts = V4NET.9.8.7
   port = PORT_S
   driver = smtp
   hosts = V4NET.9.8.7
   port = PORT_S

+  hosts_try_fastopen = :

 
 t3:
   driver = appendfile
 
 t3:
   driver = appendfile


@@ -86,5 +83,6 @@ t4:
   driver = smtp
   hosts = V4NET.10.10.10
   port = nonexistent
   driver = smtp
   hosts = V4NET.10.10.10
   port = nonexistent

+  hosts_try_fastopen = :

 
 # End
 
 # End