Merge branch '4.next'

[exim.git] / test / stdout / 0572

diff --git a/test/stdout/0572 b/test/stdout/0572
index 44ced8ce3cd98f70e7cc199d339acae8d8a14323..4d428078f3cc70ede0514e057cfdac98c1079ca8 100644 (file)
--- a/test/stdout/0572
+++ b/test/stdout/0572
@@ -41,7 +41,7 @@ data_timeout = 5m
 delay_after_cutoff
 dns_qualify_single
 no_dns_search_parents
-dnssec_request_domains = 
+dnssec_request_domains = *
 dnssec_require_domains = 
 dscp = 
 fallback_hosts = 
@@ -58,7 +58,7 @@ no_hosts_randomize
 hosts_require_auth = 
 hosts_try_auth = 
 hosts_try_chunking = *
-hosts_try_fastopen = *
+hosts_try_fastopen = :
 hosts_try_prdr = *
 interface = ip4.ip4.ip4.ip4
 keepalive
@@ -78,7 +78,8 @@ OPT =
 # 1 "TESTSUITE/aux-var/std_conf_prefix"
 # 1 "TESTSUITE/aux-var/std_conf_prefix"
 # 1 "TESTSUITE/aux-var/tls_conf_prefix"
-keep_environment = PATH:SSLKEYLOGFILE:EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+keep_environment = PATH:EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+add_environment = SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 exim_path = TESTSUITE/eximdir/exim
 host_lookup_order = bydns
 spool_directory = TESTSUITE/spool
@@ -110,6 +111,7 @@ begin transports
     driver = smtp
     interface = ip4.ip4.ip4.ip4
     port = 1224
+    hosts_try_fastopen = :
     debug_print = transport_name <$transport_name>
 # Exim Configuration (X)
 # 1 "TESTSUITE/test-config"
@@ -118,7 +120,8 @@ OPT =
 # 1 "TESTSUITE/aux-var/std_conf_prefix"
 # 1 "TESTSUITE/aux-var/std_conf_prefix"
 # 1 "TESTSUITE/aux-var/tls_conf_prefix"
-keep_environment = PATH:SSLKEYLOGFILE:EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+keep_environment = PATH:EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+add_environment = SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 exim_path = TESTSUITE/eximdir/exim
 host_lookup_order = bydns
 spool_directory = TESTSUITE/spool
@@ -146,4 +149,5 @@ my_smtp:
 driver = smtp
 interface = ip4.ip4.ip4.ip4
 port = 1224
+hosts_try_fastopen = :
 debug_print = transport_name <$transport_name>