[exim-cvs] Testsuite: explicitly disable TFO in transports

Startseite
Nachricht löschen
Nachricht beantworten
Autor: Exim Git Commits Mailing List
Datum:  
To: exim-cvs
Betreff: [exim-cvs] Testsuite: explicitly disable TFO in transports
Gitweb: https://git.exim.org/exim.git/commitdiff/277b99794bf90e4a64b4adee88c08bed417bc5ee
Commit:     277b99794bf90e4a64b4adee88c08bed417bc5ee
Parent:     53c7b3a70978c2748f46d1d99211530750b1de22
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Dec 8 21:15:17 2019 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Sun Dec 8 22:36:22 2019 +0000


    Testsuite: explicitly disable TFO in transports
---
 test/confs/0015  |  1 +
 test/confs/0032  |  1 +
 test/confs/0033  |  1 +
 test/confs/0036  |  1 +
 test/confs/0039  |  1 +
 test/confs/0045  |  1 +
 test/confs/0047  |  1 +
 test/confs/0054  |  1 +
 test/confs/0055  |  1 +
 test/confs/0078  |  1 +
 test/confs/0089  |  1 +
 test/confs/0098  |  2 ++
 test/confs/0099  |  1 +
 test/confs/0100  |  2 ++
 test/confs/0101  |  1 +
 test/confs/0106  |  1 +
 test/confs/0108  |  1 +
 test/confs/0109  |  1 +
 test/confs/0130  |  1 +
 test/confs/0135  |  1 +
 test/confs/0143  |  1 +
 test/confs/0144  |  1 +
 test/confs/0145  |  1 +
 test/confs/0146  |  1 +
 test/confs/0147  |  1 +
 test/confs/0160  |  1 +
 test/confs/0161  |  1 +
 test/confs/0163  |  1 +
 test/confs/0175  |  1 +
 test/confs/0177  |  1 +
 test/confs/0179  |  1 +
 test/confs/0183  |  1 +
 test/confs/0185  |  1 +
 test/confs/0186  |  1 +
 test/confs/0187  |  1 +
 test/confs/0190  |  3 +++
 test/confs/0191  |  1 +
 test/confs/0197  |  1 +
 test/confs/0198  |  1 +
 test/confs/0200  |  1 +
 test/confs/0201  |  1 +
 test/confs/0203  |  1 +
 test/confs/0208  |  1 +
 test/confs/0209  |  1 +
 test/confs/0210  |  1 +
 test/confs/0211  |  1 +
 test/confs/0213  |  1 +
 test/confs/0215  |  1 +
 test/confs/0216  |  1 +
 test/confs/0217  |  1 +
 test/confs/0218  |  1 +
 test/confs/0225  |  1 +
 test/confs/0227  |  1 +
 test/confs/0228  |  1 +
 test/confs/0229  |  1 +
 test/confs/0230  |  1 +
 test/confs/0231  |  1 +
 test/confs/0238  |  1 +
 test/confs/0239  |  1 +
 test/confs/0242  |  1 +
 test/confs/0253  |  1 +
 test/confs/0257  |  1 +
 test/confs/0259  |  1 +
 test/confs/0261  |  2 ++
 test/confs/0263  |  1 +
 test/confs/0273  |  1 +
 test/confs/0276  |  1 +
 test/confs/0285  |  1 +
 test/confs/0286  |  1 +
 test/confs/0288  |  1 +
 test/confs/0292  |  1 +
 test/confs/0299  |  1 +
 test/confs/0315  |  1 +
 test/confs/0322  |  1 +
 test/confs/0332  |  1 +
 test/confs/0333  |  1 +
 test/confs/0334  |  1 +
 test/confs/0341  |  1 +
 test/confs/0342  |  1 +
 test/confs/0343  |  1 +
 test/confs/0344  |  4 ++++
 test/confs/0350  |  1 +
 test/confs/0357  |  1 +
 test/confs/0358  |  1 +
 test/confs/0360  |  1 +
 test/confs/0361  |  1 +
 test/confs/0362  |  1 +
 test/confs/0363  |  1 +
 test/confs/0364  |  1 +
 test/confs/0365  |  1 +
 test/confs/0366  |  1 +
 test/confs/0367  |  1 +
 test/confs/0368  |  1 +
 test/confs/0374  |  1 +
 test/confs/0375  |  3 +++
 test/confs/0376  |  1 +
 test/confs/0388  |  1 +
 test/confs/0392  |  2 ++
 test/confs/0398  |  1 +
 test/confs/0405  |  1 +
 test/confs/0413  |  2 ++
 test/confs/0417  |  1 +
 test/confs/0419  |  1 +
 test/confs/0425  |  1 +
 test/confs/0426  |  1 +
 test/confs/0429  |  1 +
 test/confs/0430  |  1 +
 test/confs/0431  |  1 +
 test/confs/0432  |  1 +
 test/confs/0434  |  1 +
 test/confs/0440  |  1 +
 test/confs/0447  |  1 +
 test/confs/0450  |  1 +
 test/confs/0455  |  1 +
 test/confs/0461  |  1 +
 test/confs/0462  |  1 +
 test/confs/0463  |  1 +
 test/confs/0464  |  1 +
 test/confs/0466  |  1 +
 test/confs/0467  |  1 +
 test/confs/0469  |  1 +
 test/confs/0473  |  1 +
 test/confs/0474  |  1 +
 test/confs/0476  |  1 +
 test/confs/0477  |  1 +
 test/confs/0478  |  1 +
 test/confs/0479  |  1 +
 test/confs/0492  |  1 +
 test/confs/0495  |  3 +++
 test/confs/0497  |  1 +
 test/confs/0498  |  1 +
 test/confs/0499  |  1 +
 test/confs/0504  |  1 +
 test/confs/0511  |  1 +
 test/confs/0512  |  1 +
 test/confs/0518  |  2 ++
 test/confs/0519  |  1 +
 test/confs/0525  |  1 +
 test/confs/0528  |  1 +
 test/confs/0531  |  1 +
 test/confs/0538  |  1 +
 test/confs/0540  |  1 +
 test/confs/0543  |  1 +
 test/confs/0544  |  1 +
 test/confs/0545  |  1 +
 test/confs/0548  |  1 +
 test/confs/0550  |  1 +
 test/confs/0552  |  1 +
 test/confs/0553  |  1 +
 test/confs/0554  |  1 +
 test/confs/0557  |  1 +
 test/confs/0561  |  1 +
 test/confs/0565  |  2 ++
 test/confs/0570  |  1 +
 test/confs/0572  |  1 +
 test/confs/0580  |  1 +
 test/confs/0603  |  1 +
 test/confs/0604  |  1 +
 test/confs/0607  |  1 +
 test/confs/0610  |  2 ++
 test/confs/0611  |  1 +
 test/confs/0613  |  1 +
 test/confs/0616  |  1 +
 test/confs/0617  |  1 +
 test/confs/0618  |  1 +
 test/confs/0900  |  2 ++
 test/confs/0901  |  2 ++
 test/confs/0906  |  2 ++
 test/confs/1003  |  6 ++++++
 test/confs/1005  |  1 +
 test/confs/1006  |  1 +
 test/confs/1008  |  1 +
 test/confs/1009  |  1 +
 test/confs/2000  |  1 +
 test/confs/2001  |  1 +
 test/confs/2007  |  2 ++
 test/confs/2008  |  2 ++
 test/confs/2009  |  3 ++-
 test/confs/2010  |  3 ++-
 test/confs/2012  | 12 +++++++++---
 test/confs/2013  |  3 ++-
 test/confs/2016  |  1 +
 test/confs/2017  |  3 ++-
 test/confs/2021  |  1 +
 test/confs/2025  |  1 +
 test/confs/2026  |  1 +
 test/confs/2030  |  2 ++
 test/confs/2031  |  2 ++
 test/confs/2033  | 13 ++++++++++---
 test/confs/2100  |  1 +
 test/confs/2101  |  1 +
 test/confs/2107  |  2 ++
 test/confs/2108  |  2 ++
 test/confs/2109  |  3 ++-
 test/confs/2110  |  3 ++-
 test/confs/2111  |  3 ++-
 test/confs/2112  | 12 +++++++++---
 test/confs/2113  |  3 ++-
 test/confs/2116  |  3 ++-
 test/confs/2117  |  3 ++-
 test/confs/2120  |  1 +
 test/confs/2121  |  1 +
 test/confs/2125  |  3 ++-
 test/confs/2126  |  1 +
 test/confs/2127  |  1 +
 test/confs/2130  |  2 ++
 test/confs/2131  |  2 ++
 test/confs/2133  | 13 ++++++++++---
 test/confs/2135  |  1 +
 test/confs/2138  |  3 ++-
 test/confs/2149  |  1 +
 test/confs/2151  |  1 +
 test/confs/2152  |  2 ++
 test/confs/2201  |  1 +
 test/confs/3207  |  1 +
 test/confs/3209  |  1 +
 test/confs/3401  |  6 ++++--
 test/confs/3404  |  3 ++-
 test/confs/3405  |  3 ++-
 test/confs/3412  |  1 +
 test/confs/3416  |  2 ++
 test/confs/3451  |  3 ++-
 test/confs/3452  |  3 ++-
 test/confs/3455  |  1 +
 test/confs/3461  |  3 ++-
 test/confs/3462  |  3 ++-
 test/confs/3465  |  1 +
 test/confs/3501  |  6 ++++--
 test/confs/3600  |  1 +
 test/confs/3700  |  2 ++
 test/confs/3720  |  1 +
 test/confs/4028  |  1 +
 test/confs/4029  |  1 +
 test/confs/4201  |  1 +
 test/confs/4211  |  1 +
 test/confs/4221  |  1 +
 test/confs/4520  |  1 +
 test/confs/4525  |  1 +
 test/confs/4550  |  1 +
 test/confs/4700  |  1 +
 test/confs/4800  |  1 +
 test/confs/4801  |  1 +
 test/confs/4802  |  1 +
 test/confs/4803  |  1 +
 test/confs/4804  |  1 +
 test/confs/4950  |  1 +
 test/confs/5204  |  2 ++
 test/confs/5205  |  1 +
 test/confs/5206  |  1 +
 test/confs/5208  |  1 +
 test/confs/5300  |  1 +
 test/confs/5301  |  1 +
 test/confs/5400  |  2 ++
 test/confs/5401  |  1 +
 test/confs/5402  |  1 +
 test/confs/5403  |  2 ++
 test/confs/5410  |  1 +
 test/confs/5420  |  1 +
 test/confs/5510  |  1 +
 test/confs/5601  |  4 ++++
 test/confs/5611  |  4 ++++
 test/confs/5651  |  4 ++++
 test/confs/5652  |  1 +
 test/confs/5700  |  1 +
 test/confs/5702  |  1 +
 test/confs/5703  |  1 +
 test/confs/5710  |  1 +
 test/confs/5720  |  1 +
 test/confs/5730  |  4 ++++
 test/confs/5740  |  4 ++++
 test/confs/5820  |  1 +
 test/confs/5840  |  1 +
 test/confs/5860  |  1 +
 test/confs/5861  |  1 +
 test/confs/5880  |  1 +
 test/confs/5890  |  1 +
 test/confs/5891  |  1 +
 test/confs/9900  |  1 +
 test/confs/9901  |  1 +
 test/confs/9903  |  1 +
 test/runtest     |  2 +-
 test/stderr/5204 |  2 +-
 test/stderr/5410 |  6 +++---
 test/stderr/5420 |  6 +++---
 test/stderr/5820 |  2 +-
 test/stderr/5840 |  2 +-
 test/stdout/0572 |  4 +++-
 287 files changed, 405 insertions(+), 45 deletions(-)


diff --git a/test/confs/0015 b/test/confs/0015
index c6fccd3..dbbdfd0 100644
--- a/test/confs/0015
+++ b/test/confs/0015
@@ -100,6 +100,7 @@ delivery_s:
driver = smtp
hosts = 127.0.0.1
port = PORT_S
+ hosts_try_fastopen = :
allow_localhost

address_reply:
diff --git a/test/confs/0032 b/test/confs/0032
index 961cefa..caf5edb 100644
--- a/test/confs/0032
+++ b/test/confs/0032
@@ -38,6 +38,7 @@ local_delivery:

 smtp:
   driver = smtp
+  hosts_try_fastopen =    :



# End
diff --git a/test/confs/0033 b/test/confs/0033
index ca06da7..c6bf4d3 100644
--- a/test/confs/0033
+++ b/test/confs/0033
@@ -38,5 +38,6 @@ begin transports
smtp:
driver = smtp
port = PORT_S
+ hosts_try_fastopen = :

# End
diff --git a/test/confs/0036 b/test/confs/0036
index 48479c7..ded6487 100644
--- a/test/confs/0036
+++ b/test/confs/0036
@@ -43,5 +43,6 @@ local_delivery:
send_to_server:
driver = smtp
port = PORT_D
+ hosts_try_fastopen = :

 # End
diff --git a/test/confs/0039 b/test/confs/0039
index 8ca8b1e..f718997 100644
--- a/test/confs/0039
+++ b/test/confs/0039
@@ -37,5 +37,6 @@ begin transports
 t1:
   driver = smtp
   hosts = V4NET.0.0.0
+  hosts_try_fastopen =    :


# End
diff --git a/test/confs/0045 b/test/confs/0045
index a59c8e2..2a9efb5 100644
--- a/test/confs/0045
+++ b/test/confs/0045
@@ -21,6 +21,7 @@ begin transports

 smtp:
   driver = smtp
+  hosts_try_fastopen =    :



# End
diff --git a/test/confs/0047 b/test/confs/0047
index 187f855..f9d77bd 100644
--- a/test/confs/0047
+++ b/test/confs/0047
@@ -25,5 +25,6 @@ begin transports

 smtp:
   driver = smtp
+  hosts_try_fastopen =    :


# End
diff --git a/test/confs/0054 b/test/confs/0054
index 3ad8751..1af7c0d 100644
--- a/test/confs/0054
+++ b/test/confs/0054
@@ -25,6 +25,7 @@ begin transports

 smtp:
   driver = smtp
+  hosts_try_fastopen =    :



# End
diff --git a/test/confs/0055 b/test/confs/0055
index 72a2be7..6cc9b7c 100644
--- a/test/confs/0055
+++ b/test/confs/0055
@@ -52,6 +52,7 @@ local_delivery:

 smtp:
   driver = smtp
+  hosts_try_fastopen =    :



# ----- Retry -----
diff --git a/test/confs/0078 b/test/confs/0078
index aa1e445..fe325bc 100644
--- a/test/confs/0078
+++ b/test/confs/0078
@@ -44,6 +44,7 @@ begin transports

 remote_smtp:
   driver = smtp
+  hosts_try_fastopen =    :



# End
diff --git a/test/confs/0089 b/test/confs/0089
index b8bd142..4a2a658 100644
--- a/test/confs/0089
+++ b/test/confs/0089
@@ -68,6 +68,7 @@ begin transports

 dummy:
   driver = smtp
+  hosts_try_fastopen =    :



 # End
diff --git a/test/confs/0098 b/test/confs/0098
index 719971c..cce115f 100644
--- a/test/confs/0098
+++ b/test/confs/0098
@@ -92,10 +92,12 @@ smtp:
   driver = smtp
   connect_timeout = 1s
   port = PORT_D
+  hosts_try_fastopen =    :


 smtp_connect_refused:
   driver = smtp
   port = PORT_N
+  hosts_try_fastopen =    :



 # ----- Retry -----
diff --git a/test/confs/0099 b/test/confs/0099
index 63a918a..6a59d59 100644
--- a/test/confs/0099
+++ b/test/confs/0099
@@ -41,6 +41,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_N
+  hosts_try_fastopen =    :
   RETRY



diff --git a/test/confs/0100 b/test/confs/0100
index c404d5a..143ff4c 100644
--- a/test/confs/0100
+++ b/test/confs/0100
@@ -72,10 +72,12 @@ begin transports
smtp:
driver = smtp
port = PORT_S
+ hosts_try_fastopen = :

filtered_smtp:
driver = smtp
port = PORT_S
+ hosts_try_fastopen = :
transport_filter = /bin/sh -c "echo 'X-Filtered: just checking'; cat"

local_delivery:
diff --git a/test/confs/0101 b/test/confs/0101
index 377eae7..cf89fa8 100644
--- a/test/confs/0101
+++ b/test/confs/0101
@@ -50,6 +50,7 @@ begin transports
smtp:
driver = smtp
port = PORT_S
+ hosts_try_fastopen = :

 local_delivery:
   driver = pipe
diff --git a/test/confs/0106 b/test/confs/0106
index ef91e8b..84294a6 100644
--- a/test/confs/0106
+++ b/test/confs/0106
@@ -29,6 +29,7 @@ smtp:
   command_timeout = 1s
   final_timeout = 1s
   port = PORT_S
+  hosts_try_fastopen =    :


# ----- Retry -----

diff --git a/test/confs/0108 b/test/confs/0108
index a4ee442..bc694ff 100644
--- a/test/confs/0108
+++ b/test/confs/0108
@@ -32,6 +32,7 @@ begin transports

 smtp:
   driver = smtp
+  hosts_try_fastopen =    :



 # End
diff --git a/test/confs/0109 b/test/confs/0109
index 59957b9..ce49c0e 100644
--- a/test/confs/0109
+++ b/test/confs/0109
@@ -28,6 +28,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_N
+  hosts_try_fastopen =    :
   allow_localhost



diff --git a/test/confs/0130 b/test/confs/0130
index 02a0953..fbfd2ec 100644
--- a/test/confs/0130
+++ b/test/confs/0130
@@ -43,6 +43,7 @@ begin transports

 smtp:
   driver = smtp
+  hosts_try_fastopen =    :



# ----- Retry -----
diff --git a/test/confs/0135 b/test/confs/0135
index 6362944..7fd5bda 100644
--- a/test/confs/0135
+++ b/test/confs/0135
@@ -44,6 +44,7 @@ begin transports

 smtp:
   driver = smtp
+  hosts_try_fastopen =    :
   connect_timeout = 1s


local_delivery:
diff --git a/test/confs/0143 b/test/confs/0143
index 5a6ee34..8f0300a 100644
--- a/test/confs/0143
+++ b/test/confs/0143
@@ -31,6 +31,7 @@ my_smtp:
driver = smtp
interface = HOSTIPV4
port = PORT_S
+ hosts_try_fastopen = :
debug_print = transport_name <$transport_name>


diff --git a/test/confs/0144 b/test/confs/0144
index 34b3823..0b950b8 100644
--- a/test/confs/0144
+++ b/test/confs/0144
@@ -28,6 +28,7 @@ begin transports

 smtp:
   driver = smtp
+  hosts_try_fastopen =    :



# ----- Retry -----
diff --git a/test/confs/0145 b/test/confs/0145
index 16b02a8..c7d8c86 100644
--- a/test/confs/0145
+++ b/test/confs/0145
@@ -35,6 +35,7 @@ begin transports

 smtp:
   driver = smtp
+  hosts_try_fastopen =    :



# ----- Retry -----
diff --git a/test/confs/0146 b/test/confs/0146
index d8b6067..8039ebd 100644
--- a/test/confs/0146
+++ b/test/confs/0146
@@ -27,6 +27,7 @@ begin transports

 smtp:
   driver = smtp
+  hosts_try_fastopen =    :



# End
diff --git a/test/confs/0147 b/test/confs/0147
index 996d064..fae99a9 100644
--- a/test/confs/0147
+++ b/test/confs/0147
@@ -60,6 +60,7 @@ begin transports

 T1:
   driver = smtp
+  hosts_try_fastopen =    :



 #----- ACL -----
diff --git a/test/confs/0160 b/test/confs/0160
index f648837..ea2003a 100644
--- a/test/confs/0160
+++ b/test/confs/0160
@@ -31,6 +31,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :



# ----- Retry -----
diff --git a/test/confs/0161 b/test/confs/0161
index 8b91ea0..88845f3 100644
--- a/test/confs/0161
+++ b/test/confs/0161
@@ -62,6 +62,7 @@ begin transports

 remote_smtp:
   driver = smtp
+  hosts_try_fastopen =    :



 # End
diff --git a/test/confs/0163 b/test/confs/0163
index 7b19d9f..806c4b9 100644
--- a/test/confs/0163
+++ b/test/confs/0163
@@ -28,6 +28,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :



# ----- Retry -----
diff --git a/test/confs/0175 b/test/confs/0175
index b20e4fe..461c265 100644
--- a/test/confs/0175
+++ b/test/confs/0175
@@ -58,6 +58,7 @@ begin transports

 smtp:
   driver = smtp
+  hosts_try_fastopen =    :


appendfile:
driver = appendfile
diff --git a/test/confs/0177 b/test/confs/0177
index 7921a8b..0b78d4e 100644
--- a/test/confs/0177
+++ b/test/confs/0177
@@ -75,6 +75,7 @@ autoreply:
smtp:
driver = smtp
port = PORT_S
+ hosts_try_fastopen = :


# ----- Retry -----
diff --git a/test/confs/0179 b/test/confs/0179
index 381b41c..f18ab32 100644
--- a/test/confs/0179
+++ b/test/confs/0179
@@ -30,6 +30,7 @@ begin transports
smtp:
driver = smtp
port = PORT_S
+ hosts_try_fastopen = :


# ----- Retry -----
diff --git a/test/confs/0183 b/test/confs/0183
index 8cd4c82..d55e579 100644
--- a/test/confs/0183
+++ b/test/confs/0183
@@ -57,6 +57,7 @@ begin transports

 smtp:
   driver = smtp
+  hosts_try_fastopen =    :



# End
diff --git a/test/confs/0185 b/test/confs/0185
index d6e9fe0..d9d20fc 100644
--- a/test/confs/0185
+++ b/test/confs/0185
@@ -72,6 +72,7 @@ autoreply:
smtp:
driver = smtp
port = PORT_S
+ hosts_try_fastopen = :


 # ----- Retry -----
diff --git a/test/confs/0186 b/test/confs/0186
index 21b3106..5dffb3d 100644
--- a/test/confs/0186
+++ b/test/confs/0186
@@ -34,6 +34,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :



 # End
diff --git a/test/confs/0187 b/test/confs/0187
index bca41b5..e2cd27e 100644
--- a/test/confs/0187
+++ b/test/confs/0187
@@ -45,6 +45,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :



# ----- Retry -----
diff --git a/test/confs/0190 b/test/confs/0190
index 03ded9c..cdddae5 100644
--- a/test/confs/0190
+++ b/test/confs/0190
@@ -85,10 +85,12 @@ smtp:
max_rcpt = 1
connection_max_messages = 1
port = PORT_S
+ hosts_try_fastopen = :

smtp2:
driver = smtp
port = PORT_S
+ hosts_try_fastopen = :

smtp3:
driver = smtp
@@ -96,6 +98,7 @@ smtp3:
max_rcpt = 2
connection_max_messages = 1
port = PORT_S
+ hosts_try_fastopen = :


 # ----- Retry -----
diff --git a/test/confs/0191 b/test/confs/0191
index 9dba8c3..13d98bf 100644
--- a/test/confs/0191
+++ b/test/confs/0191
@@ -28,6 +28,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :
   transport_filter = \
     /bin/sh -c \
     "cat >/dev/null; printf Line-without-end || /bin/echo -n Line-without-end"
diff --git a/test/confs/0197 b/test/confs/0197
index b3f25c4..c2e4a10 100644
--- a/test/confs/0197
+++ b/test/confs/0197
@@ -95,6 +95,7 @@ makecopy:


 pass_on:
   driver = smtp
+  hosts_try_fastopen =    :
   connect_timeout = 1s



diff --git a/test/confs/0198 b/test/confs/0198
index f754a31..5de7701 100644
--- a/test/confs/0198
+++ b/test/confs/0198
@@ -55,6 +55,7 @@ begin transports

 pass_on:
   driver = smtp
+  hosts_try_fastopen =    :
   connect_timeout = 1s
   gethostbyname
   hosts = NEXTHOST
diff --git a/test/confs/0200 b/test/confs/0200
index ab50f36..03e6288 100644
--- a/test/confs/0200
+++ b/test/confs/0200
@@ -35,6 +35,7 @@ begin transports


 smtp:
   driver = smtp
+  hosts_try_fastopen =    :



 # End
diff --git a/test/confs/0201 b/test/confs/0201
index 5385baa..b4ad0d8 100644
--- a/test/confs/0201
+++ b/test/confs/0201
@@ -26,6 +26,7 @@ t1:
   hosts = 127.0.0.1
   allow_localhost
   port = PORT_S
+  hosts_try_fastopen =    :
   transport_filter = /bin/sh -c 'cat; exit 99'



diff --git a/test/confs/0203 b/test/confs/0203
index 38e8790..1c197e7 100644
--- a/test/confs/0203
+++ b/test/confs/0203
@@ -29,6 +29,7 @@ begin transports
smtp:
driver = smtp
port = PORT_S
+ hosts_try_fastopen = :


 # ----- Retry -----
diff --git a/test/confs/0208 b/test/confs/0208
index 5a0b9f1..f1e9fea 100644
--- a/test/confs/0208
+++ b/test/confs/0208
@@ -59,6 +59,7 @@ fail:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen =    :



# ----- Retry -----
diff --git a/test/confs/0209 b/test/confs/0209
index 82046c7..b9d23b0 100644
--- a/test/confs/0209
+++ b/test/confs/0209
@@ -39,6 +39,7 @@ begin transports
smtp:
driver = smtp
port = PORT_S
+ hosts_try_fastopen = :


# ----- Retry -----
diff --git a/test/confs/0210 b/test/confs/0210
index b1db522..298ad72 100644
--- a/test/confs/0210
+++ b/test/confs/0210
@@ -62,6 +62,7 @@ bsmtp_smtp:
allow_localhost
hosts = 127.0.0.1
port = PORT_S
+ hosts_try_fastopen = :


 # ----- Retry -----
diff --git a/test/confs/0211 b/test/confs/0211
index 7856481..b1dae70 100644
--- a/test/confs/0211
+++ b/test/confs/0211
@@ -52,6 +52,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :
   command_timeout = 1s


 local_delivery:
diff --git a/test/confs/0213 b/test/confs/0213
index ba0b9e4..388f693 100644
--- a/test/confs/0213
+++ b/test/confs/0213
@@ -29,6 +29,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :



# ----- Retry -----
diff --git a/test/confs/0215 b/test/confs/0215
index ad40d63..2758b07 100644
--- a/test/confs/0215
+++ b/test/confs/0215
@@ -40,6 +40,7 @@ lmtp:
allow_localhost
hosts = 127.0.0.1
port = PORT_S
+ hosts_try_fastopen = :
protocol = LMTP
lmtp_ignore_quota = IGNORE_QUOTA
AUTHS
diff --git a/test/confs/0216 b/test/confs/0216
index 69af543..962a64c 100644
--- a/test/confs/0216
+++ b/test/confs/0216
@@ -36,6 +36,7 @@ send_to_server:
allow_localhost
hosts = 127.0.0.1
port = PORT_D
+ hosts_try_fastopen = :
max_rcpt = 0
HAP

diff --git a/test/confs/0217 b/test/confs/0217
index fa79726..a225df5 100644
--- a/test/confs/0217
+++ b/test/confs/0217
@@ -41,6 +41,7 @@ send_to_server:
command_timeout = 1s
hosts = 127.0.0.1
port = PORT_S
+ hosts_try_fastopen = :
HAP
max_rcpt = 1000

diff --git a/test/confs/0218 b/test/confs/0218
index fa97f9c..250bc92 100644
--- a/test/confs/0218
+++ b/test/confs/0218
@@ -52,6 +52,7 @@ send_to_server:
command_timeout = 1s
hosts = 127.0.0.1
port = PORT_S
+ hosts_try_fastopen = :
debug_print = T: $transport_name (${acl {expand_check}})


diff --git a/test/confs/0225 b/test/confs/0225
index 3139eea..0ed97b4 100644
--- a/test/confs/0225
+++ b/test/confs/0225
@@ -40,6 +40,7 @@ begin transports

 smtp:
   driver = smtp
+  hosts_try_fastopen =    :


 local_delivery:
   driver = appendfile
diff --git a/test/confs/0227 b/test/confs/0227
index fea66e1..36050fa 100644
--- a/test/confs/0227
+++ b/test/confs/0227
@@ -81,6 +81,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :


 lmtp:
   driver = smtp
diff --git a/test/confs/0228 b/test/confs/0228
index 19f6cb7..d8fb762 100644
--- a/test/confs/0228
+++ b/test/confs/0228
@@ -31,6 +31,7 @@ smtp:
   driver = smtp
   fallback_hosts = HOSTIPV4
   port = PORT_S
+  hosts_try_fastopen =    :



 # ----- Retry -----
diff --git a/test/confs/0229 b/test/confs/0229
index 5389f97..c8c048d 100644
--- a/test/confs/0229
+++ b/test/confs/0229
@@ -32,6 +32,7 @@ smtp:
           127.0.0.1 : 127.0.0.1 : HOSTIPV4 : \
           127.0.0.1 : 127.0.0.1 : HOSTIPV4
   port = PORT_S
+  hosts_try_fastopen =    :



# ----- Retry -----
diff --git a/test/confs/0230 b/test/confs/0230
index c26b457..f77f52f 100644
--- a/test/confs/0230
+++ b/test/confs/0230
@@ -64,6 +64,7 @@ local_delivery:
remote:
driver = smtp
port = PORT_D
+ hosts_try_fastopen = :

# ----- Retry -----

diff --git a/test/confs/0231 b/test/confs/0231
index d0adf39..1eabae9 100644
--- a/test/confs/0231
+++ b/test/confs/0231
@@ -65,6 +65,7 @@ smtp_rewrite:
   headers_rewrite = *@domain1 $1-rewrite@domain2 f :\
                     *@domain1 $1-other@domain2
   port = PORT_S
+  hosts_try_fastopen = :



# ----- Retry -----
diff --git a/test/confs/0238 b/test/confs/0238
index 15aa220..4d92cdd 100644
--- a/test/confs/0238
+++ b/test/confs/0238
@@ -33,6 +33,7 @@ begin transports

 smtp:
   driver = smtp
+  hosts_try_fastopen =    :



# ----- Retry -----
diff --git a/test/confs/0239 b/test/confs/0239
index f4b1a68..e7e2651 100644
--- a/test/confs/0239
+++ b/test/confs/0239
@@ -39,6 +39,7 @@ local:

 smtp:
   driver = smtp
+  hosts_try_fastopen =    :



# ----- Retry -----
diff --git a/test/confs/0242 b/test/confs/0242
index fc2dd70..63265a6 100644
--- a/test/confs/0242
+++ b/test/confs/0242
@@ -30,6 +30,7 @@ begin transports
smtp:
driver = smtp
port = PORT_S
+ hosts_try_fastopen = :


 # ----- Retry -----
diff --git a/test/confs/0253 b/test/confs/0253
index cd2c777..40ede04 100644
--- a/test/confs/0253
+++ b/test/confs/0253
@@ -64,6 +64,7 @@ t3:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen = :
   max_rcpt = 1
   allow_localhost
   return_path = pqr=$local_part+$domain@???
diff --git a/test/confs/0257 b/test/confs/0257
index f616893..056b54f 100644
--- a/test/confs/0257
+++ b/test/confs/0257
@@ -30,6 +30,7 @@ smtp:
   connect_timeout = 1s
   fallback_hosts = ten-2.test.ex
   port = PORT_S
+  hosts_try_fastopen =    :



 # ----- Retry -----
diff --git a/test/confs/0259 b/test/confs/0259
index 6b9bc29..f6ae742 100644
--- a/test/confs/0259
+++ b/test/confs/0259
@@ -26,6 +26,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :



 begin retry
diff --git a/test/confs/0261 b/test/confs/0261
index 30ec087..7b2b7a1 100644
--- a/test/confs/0261
+++ b/test/confs/0261
@@ -16,10 +16,12 @@ begin transports
 remote_delivery:
   driver = smtp
   hosts = V4NET.0.0.1
+  hosts_try_fastopen =    :


 bad_return:
   driver = smtp
   hosts = V4NET.0.0.0
+  hosts_try_fastopen =    :
   return_path = ${if


no_hosts:
diff --git a/test/confs/0263 b/test/confs/0263
index 53b0064..f215cdb 100644
--- a/test/confs/0263
+++ b/test/confs/0263
@@ -14,6 +14,7 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :


# ----- Routers -----

diff --git a/test/confs/0273 b/test/confs/0273
index 0a12a67..4acc0a9 100644
--- a/test/confs/0273
+++ b/test/confs/0273
@@ -16,6 +16,7 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :


# ----- Routers -----

diff --git a/test/confs/0276 b/test/confs/0276
index 257cf45..94e7a13 100644
--- a/test/confs/0276
+++ b/test/confs/0276
@@ -16,6 +16,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen =    :
   allow_localhost


# ----- Routers -----
diff --git a/test/confs/0285 b/test/confs/0285
index f0871a5..8b0ada1 100644
--- a/test/confs/0285
+++ b/test/confs/0285
@@ -33,6 +33,7 @@ begin transports
smtp:
driver = smtp
port = PORT_S
+ hosts_try_fastopen = :
max_rcpt = 2
connection_max_messages = 3

diff --git a/test/confs/0286 b/test/confs/0286
index 8ec70bf..c6f5daa 100644
--- a/test/confs/0286
+++ b/test/confs/0286
@@ -34,6 +34,7 @@ begin transports
smtp:
driver = smtp
port = PORT_S
+ hosts_try_fastopen = :
max_rcpt = 2
connection_max_messages = 3

diff --git a/test/confs/0288 b/test/confs/0288
index 12c308b..ac7369b 100644
--- a/test/confs/0288
+++ b/test/confs/0288
@@ -30,6 +30,7 @@ begin transports
smtp:
driver = smtp
port = PORT_S
+ hosts_try_fastopen = :
max_rcpt = 1
connection_max_messages = 1
serialize_hosts = 127.0.0.1
diff --git a/test/confs/0292 b/test/confs/0292
index 6e70a79..d3ea4f3 100644
--- a/test/confs/0292
+++ b/test/confs/0292
@@ -38,6 +38,7 @@ t1:

 t2:
   driver = smtp
+  hosts_try_fastopen =    :
   debug_print = \$host=$host \$host_address=$host_address


# End
diff --git a/test/confs/0299 b/test/confs/0299
index 5d648b8..d7dc873 100644
--- a/test/confs/0299
+++ b/test/confs/0299
@@ -38,6 +38,7 @@ t2:
driver = smtp
hosts = 127.0.0.1
port = PORT_S
+ hosts_try_fastopen = :
allow_localhost
max_rcpt = 2

diff --git a/test/confs/0315 b/test/confs/0315
index fed3cec..ae86fdc 100644
--- a/test/confs/0315
+++ b/test/confs/0315
@@ -28,5 +28,6 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :


 # End
diff --git a/test/confs/0322 b/test/confs/0322
index 396b0c6..f787396 100644
--- a/test/confs/0322
+++ b/test/confs/0322
@@ -29,6 +29,7 @@ smtp:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen =    :



# End
diff --git a/test/confs/0332 b/test/confs/0332
index 4fe3b3f..a309e8e 100644
--- a/test/confs/0332
+++ b/test/confs/0332
@@ -34,6 +34,7 @@ t1:
hosts = 127.0.0.1
hosts_override
port = PORT_S
+ hosts_try_fastopen = :


# ----- Retry -----
diff --git a/test/confs/0333 b/test/confs/0333
index 4192292..c14c071 100644
--- a/test/confs/0333
+++ b/test/confs/0333
@@ -33,6 +33,7 @@ t1:
hosts = 127.0.0.1
hosts_override
port = PORT_S
+ hosts_try_fastopen = :


# ----- Retry -----
diff --git a/test/confs/0334 b/test/confs/0334
index 553763b..dc4e8a0 100644
--- a/test/confs/0334
+++ b/test/confs/0334
@@ -25,6 +25,7 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :



# ----- Retry -----
diff --git a/test/confs/0341 b/test/confs/0341
index 7267933..dcc4dec 100644
--- a/test/confs/0341
+++ b/test/confs/0341
@@ -47,6 +47,7 @@ send_to_server:
allow_localhost
hosts = 127.0.0.1
port = PORT_D
+ hosts_try_fastopen = :


# End
diff --git a/test/confs/0342 b/test/confs/0342
index dba9020..b6bc47e 100644
--- a/test/confs/0342
+++ b/test/confs/0342
@@ -35,6 +35,7 @@ begin transports

 remote_smtp:
   driver = smtp
+  hosts_try_fastopen =    :



 # ----- Retry -----
diff --git a/test/confs/0343 b/test/confs/0343
index c613da4..a5741ea 100644
--- a/test/confs/0343
+++ b/test/confs/0343
@@ -25,6 +25,7 @@ remote_smtp:
   hosts = 127.0.0.1
   allow_localhost
   port = PORT_N
+  hosts_try_fastopen =    :



# ----- Retry -----
diff --git a/test/confs/0344 b/test/confs/0344
index 0b29b06..794e85e 100644
--- a/test/confs/0344
+++ b/test/confs/0344
@@ -32,15 +32,19 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :


 t2:
   driver = smtp
+  hosts_try_fastopen =    :


 t3:
   driver = smtp
+  hosts_try_fastopen =    :


 t4:
   driver = smtp
+  hosts_try_fastopen =    :



# ----- Retry -----
diff --git a/test/confs/0350 b/test/confs/0350
index 09bd635..927bdb7 100644
--- a/test/confs/0350
+++ b/test/confs/0350
@@ -25,5 +25,6 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :


 # End
diff --git a/test/confs/0357 b/test/confs/0357
index 3f11016..f6f2102 100644
--- a/test/confs/0357
+++ b/test/confs/0357
@@ -26,6 +26,7 @@ t1:
   hosts = 127.0.0.1
   allow_localhost
   port = PORT_S
+  hosts_try_fastopen =    :



 # ----- Retry -----
diff --git a/test/confs/0358 b/test/confs/0358
index 3116870..e451c84 100644
--- a/test/confs/0358
+++ b/test/confs/0358
@@ -26,6 +26,7 @@ t1:
   hosts = 127.0.0.1
   allow_localhost
   port = PORT_S
+  hosts_try_fastopen =    :



# ----- Retry -----
diff --git a/test/confs/0360 b/test/confs/0360
index d226449..f2f87c2 100644
--- a/test/confs/0360
+++ b/test/confs/0360
@@ -36,6 +36,7 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :



# ----- Retry -----
diff --git a/test/confs/0361 b/test/confs/0361
index f9007ec..909d7f3 100644
--- a/test/confs/0361
+++ b/test/confs/0361
@@ -39,6 +39,7 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :


t2:
driver = appendfile
diff --git a/test/confs/0362 b/test/confs/0362
index 6588f60..cdfe7d5 100644
--- a/test/confs/0362
+++ b/test/confs/0362
@@ -48,6 +48,7 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :


t2:
driver = appendfile
diff --git a/test/confs/0363 b/test/confs/0363
index c430408..8720248 100644
--- a/test/confs/0363
+++ b/test/confs/0363
@@ -26,6 +26,7 @@ t1:
driver = smtp
hosts = 127.0.0.1
port = PORT_S
+ hosts_try_fastopen = :
allow_localhost


diff --git a/test/confs/0364 b/test/confs/0364
index e15bc91..0ae251b 100644
--- a/test/confs/0364
+++ b/test/confs/0364
@@ -49,6 +49,7 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :


t2:
driver = appendfile
diff --git a/test/confs/0365 b/test/confs/0365
index 0bd6cc1..c5d8a0b 100644
--- a/test/confs/0365
+++ b/test/confs/0365
@@ -81,5 +81,6 @@ begin transports

 smtp:
   driver = smtp
+  hosts_try_fastopen =    :


 # End
diff --git a/test/confs/0366 b/test/confs/0366
index 97d2e62..12e47cd 100644
--- a/test/confs/0366
+++ b/test/confs/0366
@@ -29,6 +29,7 @@ smtp:
   connect_timeout = 1s
   hosts_max_try = HOSTS_MAX_TRY
   port = PORT_N
+  hosts_try_fastopen =    :



# ----- Retry -----
diff --git a/test/confs/0367 b/test/confs/0367
index 2d69a07..911c3dd 100644
--- a/test/confs/0367
+++ b/test/confs/0367
@@ -28,6 +28,7 @@ begin transports
smtp:
driver = smtp
port = PORT_S
+ hosts_try_fastopen = :


# ----- Retry -----
diff --git a/test/confs/0368 b/test/confs/0368
index fee2027..41756df 100644
--- a/test/confs/0368
+++ b/test/confs/0368
@@ -30,6 +30,7 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :



 # ----- Retry -----
diff --git a/test/confs/0374 b/test/confs/0374
index 652a506..2843442 100644
--- a/test/confs/0374
+++ b/test/confs/0374
@@ -75,6 +75,7 @@ ut3:
 ut4:
   driver = smtp
   hosts = 127.0.0.1
+  hosts_try_fastopen = :
   port = PORT_S
   allow_localhost
   max_rcpt = 1
diff --git a/test/confs/0375 b/test/confs/0375
index 06b16f3..164f327 100644
--- a/test/confs/0375
+++ b/test/confs/0375
@@ -114,6 +114,7 @@ ut4:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen = :
   allow_localhost
   max_rcpt = 1
   disable_logging
@@ -124,6 +125,7 @@ ut5:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen =    :
   allow_localhost
   max_rcpt = 1
   disable_logging
@@ -135,6 +137,7 @@ ut6:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen =    :
   allow_localhost
   max_rcpt = 1
   disable_logging
diff --git a/test/confs/0376 b/test/confs/0376
index e3a158f..7679a64 100644
--- a/test/confs/0376
+++ b/test/confs/0376
@@ -70,6 +70,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :



 # ----- Retry -----
diff --git a/test/confs/0388 b/test/confs/0388
index 9a7be30..03a8bd8 100644
--- a/test/confs/0388
+++ b/test/confs/0388
@@ -31,6 +31,7 @@ smtp:
   driver = smtp
   hosts_max_try = 1
   port = PORT_S
+  hosts_try_fastopen =    :
   connect_timeout = 2s
   address_retry_include_sender = false


diff --git a/test/confs/0392 b/test/confs/0392
index e76c867..95feb39 100644
--- a/test/confs/0392
+++ b/test/confs/0392
@@ -28,9 +28,11 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :


 t2:
   driver = smtp
+  hosts_try_fastopen =    :



 # End
diff --git a/test/confs/0398 b/test/confs/0398
index 9fbe1b8..e71a01c 100644
--- a/test/confs/0398
+++ b/test/confs/0398
@@ -60,6 +60,7 @@ t1:
 t2:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :
   allow_localhost



diff --git a/test/confs/0405 b/test/confs/0405
index edf720c..7d8a3ce 100644
--- a/test/confs/0405
+++ b/test/confs/0405
@@ -29,6 +29,7 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :



 # End
diff --git a/test/confs/0413 b/test/confs/0413
index 118dbcf..44b0da0 100644
--- a/test/confs/0413
+++ b/test/confs/0413
@@ -51,6 +51,7 @@ t1:
   hosts = 127.0.0.1
   allow_localhost
   port = PORT_S
+  hosts_try_fastopen =    :


 t2:
   driver = smtp
@@ -58,6 +59,7 @@ t2:
   hosts_override
   allow_localhost
   port = PORT_S
+  hosts_try_fastopen =    :



# End
diff --git a/test/confs/0417 b/test/confs/0417
index 41c5ed9..2f3ed5d 100644
--- a/test/confs/0417
+++ b/test/confs/0417
@@ -37,5 +37,6 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :


# End
diff --git a/test/confs/0419 b/test/confs/0419
index 39f634c..a006214 100644
--- a/test/confs/0419
+++ b/test/confs/0419
@@ -27,6 +27,7 @@ begin transports

 smtp:
  driver = smtp
+ hosts_try_fastopen =    :



# End
diff --git a/test/confs/0425 b/test/confs/0425
index 6c9383a..1ade850 100644
--- a/test/confs/0425
+++ b/test/confs/0425
@@ -38,6 +38,7 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :



 # End
diff --git a/test/confs/0426 b/test/confs/0426
index fbac9ec..c5b773f 100644
--- a/test/confs/0426
+++ b/test/confs/0426
@@ -29,6 +29,7 @@ begin transports
 t1:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :



 # End
diff --git a/test/confs/0429 b/test/confs/0429
index 49df930..c70a938 100644
--- a/test/confs/0429
+++ b/test/confs/0429
@@ -24,6 +24,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen =    :
   allow_localhost
   hosts_avoid_esmtp = 127.0.0.1


diff --git a/test/confs/0430 b/test/confs/0430
index 552b0d0..cca101c 100644
--- a/test/confs/0430
+++ b/test/confs/0430
@@ -37,5 +37,6 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :


# End
diff --git a/test/confs/0431 b/test/confs/0431
index 7590fa9..4af033c 100644
--- a/test/confs/0431
+++ b/test/confs/0431
@@ -42,6 +42,7 @@ t1:
driver = smtp
hosts = 127.0.0.1
port = PORT_S
+ hosts_try_fastopen = :
allow_localhost
AFFIX

diff --git a/test/confs/0432 b/test/confs/0432
index e8e6e35..aab1de4 100644
--- a/test/confs/0432
+++ b/test/confs/0432
@@ -37,6 +37,7 @@ t1:
   driver = smtp
   hosts = <; 127.0.0.1 ;
   port = PORT_S
+  hosts_try_fastopen =    :
   allow_localhost


# End
diff --git a/test/confs/0434 b/test/confs/0434
index 0d77fa0..7b6ec65 100644
--- a/test/confs/0434
+++ b/test/confs/0434
@@ -27,6 +27,7 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :




diff --git a/test/confs/0440 b/test/confs/0440
index 2bef8c9..fe2cef9 100644
--- a/test/confs/0440
+++ b/test/confs/0440
@@ -28,6 +28,7 @@ begin transports
t1:
driver = smtp
port = PORT_S
+ hosts_try_fastopen = :
transport_filter = /bin/cat


diff --git a/test/confs/0447 b/test/confs/0447
index 57b992d..86618fb 100644
--- a/test/confs/0447
+++ b/test/confs/0447
@@ -36,6 +36,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen =    :
   allow_localhost
   connect_timeout = 999999s


diff --git a/test/confs/0450 b/test/confs/0450
index 2dff861..7324af6 100644
--- a/test/confs/0450
+++ b/test/confs/0450
@@ -28,6 +28,7 @@ begin transports
 t1:
   driver = smtp
   hosts = 127.0.0.1
+  hosts_try_fastopen =    :
   allow_localhost
   port = ${if queue_running{PORT_D2}{PORT_D}}EXTRA


diff --git a/test/confs/0455 b/test/confs/0455
index 390c28a..becac26 100644
--- a/test/confs/0455
+++ b/test/confs/0455
@@ -39,6 +39,7 @@ begin transports

 smtp:
   driver = smtp
+  hosts_try_fastopen =    :
   connect_timeout = 1s
   hosts_max_try = HOSTS_MAX_TRY


diff --git a/test/confs/0461 b/test/confs/0461
index 30abd50..4aca116 100644
--- a/test/confs/0461
+++ b/test/confs/0461
@@ -37,6 +37,7 @@ begin transports
t1:
driver = smtp
port = PORT_S
+ hosts_try_fastopen = :
connect_timeout = 1s
allow_localhost

diff --git a/test/confs/0462 b/test/confs/0462
index 36d1841..951420f 100644
--- a/test/confs/0462
+++ b/test/confs/0462
@@ -44,6 +44,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :



 # ----- Retry -----
diff --git a/test/confs/0463 b/test/confs/0463
index 8be1d95..686e180 100644
--- a/test/confs/0463
+++ b/test/confs/0463
@@ -27,5 +27,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :


 # End
diff --git a/test/confs/0464 b/test/confs/0464
index 21e41cb..eb538e7 100644
--- a/test/confs/0464
+++ b/test/confs/0464
@@ -46,5 +46,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :


# End
diff --git a/test/confs/0466 b/test/confs/0466
index 880a41e..5805726 100644
--- a/test/confs/0466
+++ b/test/confs/0466
@@ -50,5 +50,6 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :


# End
diff --git a/test/confs/0467 b/test/confs/0467
index 147aca6..0104fac 100644
--- a/test/confs/0467
+++ b/test/confs/0467
@@ -27,5 +27,6 @@ begin transports

t1:
driver = smtp
+ hosts_try_fastopen = :

# End
diff --git a/test/confs/0469 b/test/confs/0469
index a008dde..378254b 100644
--- a/test/confs/0469
+++ b/test/confs/0469
@@ -25,5 +25,6 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :


 # End
diff --git a/test/confs/0473 b/test/confs/0473
index 6dd6b88..8e79853 100644
--- a/test/confs/0473
+++ b/test/confs/0473
@@ -42,5 +42,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :


 # End
diff --git a/test/confs/0474 b/test/confs/0474
index 35b4805..bc07dc6 100644
--- a/test/confs/0474
+++ b/test/confs/0474
@@ -24,6 +24,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :



 # ----- Retry -----
diff --git a/test/confs/0476 b/test/confs/0476
index fd6106b..1db78e7 100644
--- a/test/confs/0476
+++ b/test/confs/0476
@@ -26,6 +26,7 @@ begin transports
 t1:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :



 # ----- Retry -----
diff --git a/test/confs/0477 b/test/confs/0477
index 04d8365..6dc192e 100644
--- a/test/confs/0477
+++ b/test/confs/0477
@@ -27,6 +27,7 @@ t1:
   driver = smtp
   port = PORT_S
   interface = 99.99.99.99
+  hosts_try_fastopen =    :



 # ----- Retry -----
diff --git a/test/confs/0478 b/test/confs/0478
index cfb9a17..786f6c5 100644
--- a/test/confs/0478
+++ b/test/confs/0478
@@ -27,6 +27,7 @@ begin transports
 t1:
   driver = smtp
   port = PORT_D
+  hosts_try_fastopen = :
   hosts = ${if !eq {$sender_host_address}{} {V4NET.0.0.2} \
         {${if eq {127.0.0.1}{$local_part} {127.0.0.1} \
         {${if eq {V4NET.0.0.1}{$local_part} {V4NET.0.0.1}}}}}}
diff --git a/test/confs/0479 b/test/confs/0479
index bfb9b86..d8ea046 100644
--- a/test/confs/0479
+++ b/test/confs/0479
@@ -35,6 +35,7 @@ t1:
   driver = smtp
   port = PORT_S
   hosts = 127.0.0.1
+  hosts_try_fastopen =    :
   allow_localhost
   connect_timeout = 1s


diff --git a/test/confs/0492 b/test/confs/0492
index a939fe1..855ea31 100644
--- a/test/confs/0492
+++ b/test/confs/0492
@@ -32,6 +32,7 @@ begin transports
 t1:
   driver = smtp
   hosts = 127.0.0.1
+  hosts_try_fastopen =    :
   allow_localhost


t2:
diff --git a/test/confs/0495 b/test/confs/0495
index 5bfec70..dc1a394 100644
--- a/test/confs/0495
+++ b/test/confs/0495
@@ -64,6 +64,7 @@ t1:
driver = smtp
hosts = 127.0.0.1 : HOSTIPV4
port = PORT_S
+ hosts_try_fastopen = :
allow_localhost
command_timeout = 1s

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


 t3:
   driver = appendfile
@@ -81,5 +83,6 @@ t4:
   driver = smtp
   hosts = V4NET.10.10.10
   port = nonexistent
+  hosts_try_fastopen =    :


 # End
diff --git a/test/confs/0497 b/test/confs/0497
index 2154c3c..c1c866e 100644
--- a/test/confs/0497
+++ b/test/confs/0497
@@ -30,6 +30,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen =    :
   allow_localhost



diff --git a/test/confs/0498 b/test/confs/0498
index c26f43a..8b84a4d 100644
--- a/test/confs/0498
+++ b/test/confs/0498
@@ -30,6 +30,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen =    :
   allow_localhost
   final_timeout = 1s


diff --git a/test/confs/0499 b/test/confs/0499
index b7a0b79..32975f4 100644
--- a/test/confs/0499
+++ b/test/confs/0499
@@ -27,6 +27,7 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :



 # End
diff --git a/test/confs/0504 b/test/confs/0504
index c7b0131..981ed16 100644
--- a/test/confs/0504
+++ b/test/confs/0504
@@ -35,6 +35,7 @@ t3:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen =    :
   allow_localhost
   transport_filter = /non/existent/file


diff --git a/test/confs/0511 b/test/confs/0511
index 1ecc199..230971c 100644
--- a/test/confs/0511
+++ b/test/confs/0511
@@ -24,6 +24,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen =    :
   allow_localhost


 # End
diff --git a/test/confs/0512 b/test/confs/0512
index 15e424a..7f31b97 100644
--- a/test/confs/0512
+++ b/test/confs/0512
@@ -31,6 +31,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1 : 127.0.0.1 : 127.0.0.1 : 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen =    :
   allow_localhost
   hosts_max_try = 1
   HARDLIMIT
diff --git a/test/confs/0518 b/test/confs/0518
index c413faa..1e6dd22 100644
--- a/test/confs/0518
+++ b/test/confs/0518
@@ -40,6 +40,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen =    :
   allow_localhost
   rcpt_include_affixes


@@ -47,6 +48,7 @@ t2:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen =    :
   allow_localhost


 # End
diff --git a/test/confs/0519 b/test/confs/0519
index e6dbb00..98d55a2 100644
--- a/test/confs/0519
+++ b/test/confs/0519
@@ -25,6 +25,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1 : non-exist.test.ex
   port = PORT_S
+  hosts_try_fastopen =    :
   allow_localhost


 # End
diff --git a/test/confs/0525 b/test/confs/0525
index a6e4291..f4c35ad 100644
--- a/test/confs/0525
+++ b/test/confs/0525
@@ -32,6 +32,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen =    :
   allow_localhost
   data_timeout = 1s


diff --git a/test/confs/0528 b/test/confs/0528
index e7313a5..1e9bafa 100644
--- a/test/confs/0528
+++ b/test/confs/0528
@@ -32,6 +32,7 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :
   hosts_max_try = 20
   allow_localhost


diff --git a/test/confs/0531 b/test/confs/0531
index 2f72810..0af86b9 100644
--- a/test/confs/0531
+++ b/test/confs/0531
@@ -39,6 +39,7 @@ lmtp:
allow_localhost
hosts = 127.0.0.1
port = PORT_S
+ hosts_try_fastopen = :
protocol = LMTP


diff --git a/test/confs/0538 b/test/confs/0538
index 9081aa5..d6342bf 100644
--- a/test/confs/0538
+++ b/test/confs/0538
@@ -40,6 +40,7 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :



 # End
diff --git a/test/confs/0540 b/test/confs/0540
index 7ebbdd2..05329af 100644
--- a/test/confs/0540
+++ b/test/confs/0540
@@ -36,6 +36,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen =    :
   allow_localhost
   helo_data = ${if eq{$domain}{yes1}{localhost}{aname}}


diff --git a/test/confs/0543 b/test/confs/0543
index 88e74e5..108119c 100644
--- a/test/confs/0543
+++ b/test/confs/0543
@@ -28,6 +28,7 @@ smtp:
hosts_max_try = 1
allow_localhost
port = PORT_S
+ hosts_try_fastopen = :


 # ----- Retry -----
diff --git a/test/confs/0544 b/test/confs/0544
index 09949a3..bccfad9 100644
--- a/test/confs/0544
+++ b/test/confs/0544
@@ -52,6 +52,7 @@ smtp:
   hosts = 127.0.0.1
   allow_localhost
   port = PORT_S
+  hosts_try_fastopen =    :



# ----- Retry -----
diff --git a/test/confs/0545 b/test/confs/0545
index a78236a..a78361b 100644
--- a/test/confs/0545
+++ b/test/confs/0545
@@ -23,6 +23,7 @@ begin transports

 smtp:
   driver = smtp
+  hosts_try_fastopen =    :



 # End
diff --git a/test/confs/0548 b/test/confs/0548
index a450f45..112952e 100644
--- a/test/confs/0548
+++ b/test/confs/0548
@@ -44,6 +44,7 @@ smtp:
   hosts = HOSTIPV4 : thishost.test.ex
   allow_localhost
   port = PORT_D
+  hosts_try_fastopen =    :



 # ----- Retry -----
diff --git a/test/confs/0550 b/test/confs/0550
index caf3ced..16699b3 100644
--- a/test/confs/0550
+++ b/test/confs/0550
@@ -24,6 +24,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_S
+  hosts_try_fastopen =    :
   allow_localhost
   helo_data = \
     ${if eq{$sending_ip_address}{127.0.0.1}{Tweedledum}{Tweedledee}} \
diff --git a/test/confs/0552 b/test/confs/0552
index c4c2f5e..1531855 100644
--- a/test/confs/0552
+++ b/test/confs/0552
@@ -46,6 +46,7 @@ begin transports
 t1:
   driver = smtp
   port = PORT_D
+  hosts_try_fastopen = :
   hosts = 127.0.0.1
   allow_localhost
   command_timeout = 2s
diff --git a/test/confs/0553 b/test/confs/0553
index c9ceaa5..92fcc0a 100644
--- a/test/confs/0553
+++ b/test/confs/0553
@@ -45,6 +45,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_D
+  hosts_try_fastopen = :
   command_timeout = 2s



diff --git a/test/confs/0554 b/test/confs/0554
index c4f240c..e519d07 100644
--- a/test/confs/0554
+++ b/test/confs/0554
@@ -25,6 +25,7 @@ begin transports
smtp:
driver = smtp
port = PORT_S
+ hosts_try_fastopen = :

# ----- Retry -----

diff --git a/test/confs/0557 b/test/confs/0557
index 9b7dec2..41a614f 100644
--- a/test/confs/0557
+++ b/test/confs/0557
@@ -36,6 +36,7 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :


t2:
driver = appendfile
diff --git a/test/confs/0561 b/test/confs/0561
index 5ccf4dc..7095eb2 100644
--- a/test/confs/0561
+++ b/test/confs/0561
@@ -33,5 +33,6 @@ begin transports
t1:
driver = smtp
port = PORT_D
+ hosts_try_fastopen = :

# End
diff --git a/test/confs/0565 b/test/confs/0565
index 0d053a0..f7accd8 100644
--- a/test/confs/0565
+++ b/test/confs/0565
@@ -34,11 +34,13 @@ begin transports
remote_smtp:
driver = smtp
port = PORT_S
+ hosts_try_fastopen = :
allow_localhost

 remote_smtp_hdrs:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :
   allow_localhost
   headers_only


diff --git a/test/confs/0570 b/test/confs/0570
index 962e76b..efaf3bc 100644
--- a/test/confs/0570
+++ b/test/confs/0570
@@ -35,6 +35,7 @@ begin transports
smtp:
driver = smtp
port = PORT_D
+ hosts_try_fastopen = :
OPTION
max_parallel = 1

diff --git a/test/confs/0572 b/test/confs/0572
index 23da35a..ce621bb 100644
--- a/test/confs/0572
+++ b/test/confs/0572
@@ -35,6 +35,7 @@ my_smtp:
   driver = smtp
   interface = HOSTIPV4
   port = PORT_S
+  hosts_try_fastopen =    :
   debug_print = transport_name <$transport_name>



diff --git a/test/confs/0580 b/test/confs/0580
index 54ef7ae..6dbc06d 100644
--- a/test/confs/0580
+++ b/test/confs/0580
@@ -37,6 +37,7 @@ begin transports
t1:
driver = smtp
port = PORT_S
+ hosts_try_fastopen = :


# ----- Retry -----
diff --git a/test/confs/0603 b/test/confs/0603
index baa3ea0..eaf6a6b 100644
--- a/test/confs/0603
+++ b/test/confs/0603
@@ -43,6 +43,7 @@ send_to_server:
allow_localhost
hosts = 127.0.0.1
port = PORT_D
+ hosts_try_fastopen = :
# assumes that HOSTIPV4 can send to 127.0.0.1
interface = ${if eq {$sender_address_domain}{dustybelt.tld} {127.0.0.1}{HOSTIPV4}}

diff --git a/test/confs/0604 b/test/confs/0604
index ec51955..46fc8cf 100644
--- a/test/confs/0604
+++ b/test/confs/0604
@@ -42,6 +42,7 @@ send_to_server:
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}}

diff --git a/test/confs/0607 b/test/confs/0607
index 03c0523..c074ce4 100644
--- a/test/confs/0607
+++ b/test/confs/0607
@@ -31,6 +31,7 @@ begin transports
out:
driver = smtp
port = PORT_D
+ hosts_try_fastopen = :

# End

diff --git a/test/confs/0610 b/test/confs/0610
index 4977835..5ce2723 100644
--- a/test/confs/0610
+++ b/test/confs/0610
@@ -48,6 +48,7 @@ t1:
   hosts = 127.0.0.1
   port = PORT_D
   interface = 127.0.0.1
+  hosts_try_fastopen =    :


 t2:
   driver = smtp
@@ -55,6 +56,7 @@ t2:
   hosts = 127.0.0.1
   port = PORT_D
   interface = HOSTIPV4
+  hosts_try_fastopen =    :


# ----- Retry -----

diff --git a/test/confs/0611 b/test/confs/0611
index d3e0a47..84be24f 100644
--- a/test/confs/0611
+++ b/test/confs/0611
@@ -55,6 +55,7 @@ begin transports
 smtp:
   driver =    smtp
   port =    PORT_D
+  hosts_try_fastopen = :
   max_rcpt =    1
   connection_max_messages = 1
   max_parallel = 2
diff --git a/test/confs/0613 b/test/confs/0613
index 5094759..617c656 100644
--- a/test/confs/0613
+++ b/test/confs/0613
@@ -27,5 +27,6 @@ begin transports


 remote_smtp:
   driver = smtp
+  hosts_try_fastopen =    :


# End
diff --git a/test/confs/0616 b/test/confs/0616
index e710a4b..6fb08b3 100644
--- a/test/confs/0616
+++ b/test/confs/0616
@@ -36,5 +36,6 @@ begin transports
smtp:
driver = smtp
port = PORT_S
+ hosts_try_fastopen = :

 # End
diff --git a/test/confs/0617 b/test/confs/0617
index cf52517..625c7e3 100644
--- a/test/confs/0617
+++ b/test/confs/0617
@@ -36,5 +36,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :


 # End
diff --git a/test/confs/0618 b/test/confs/0618
index db4bd30..7359e16 100644
--- a/test/confs/0618
+++ b/test/confs/0618
@@ -75,6 +75,7 @@ begin transports
 smtp:
   driver =    smtp
   event_action = ${acl {ev_log}}
+  hosts_try_fastopen = :


 bad_tpt:
   driver =    smtp
diff --git a/test/confs/0900 b/test/confs/0900
index ce6f2c3..4c824c4 100644
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -106,6 +106,7 @@ remote_smtp:
   driver = smtp
   hosts =    127.0.0.1
   port =    PORT_S
+  hosts_try_fastopen = :
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
@@ -114,6 +115,7 @@ remote_smtp_dkim:
   driver = smtp
   hosts =    127.0.0.1
   port =    PORT_S
+  hosts_try_fastopen = :
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
diff --git a/test/confs/0901 b/test/confs/0901
index 67b73cd..2e299c7 100644
--- a/test/confs/0901
+++ b/test/confs/0901
@@ -97,6 +97,7 @@ remote_smtp:
   driver = smtp
   hosts =    127.0.0.1
   port =    PORT_S
+  hosts_try_fastopen =    :
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
@@ -105,6 +106,7 @@ remote_smtp_dkim:
   driver = smtp
   hosts =    127.0.0.1
   port =    PORT_S
+  hosts_try_fastopen =    :
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
diff --git a/test/confs/0906 b/test/confs/0906
index 6df517e..c320b25 100644
--- a/test/confs/0906
+++ b/test/confs/0906
@@ -85,12 +85,14 @@ remote_smtp:
   driver = smtp
   hosts =    127.0.0.1
   port =    PORT_D
+  hosts_try_fastopen = :
   allow_localhost


 remote_smtp_dkim:
   driver = smtp
   hosts =    127.0.0.1
   port =    PORT_D
+  hosts_try_fastopen = :
   allow_localhost


.ifdef OPT
diff --git a/test/confs/1003 b/test/confs/1003
index d15a892..df1e488 100644
--- a/test/confs/1003
+++ b/test/confs/1003
@@ -46,6 +46,7 @@ send_to_server1:
allow_localhost
hosts = ${if eq {$local_part}{user4} {127.0.0.1} {<; ::1}}
port = PORT_D
+ hosts_try_fastopen = :
interface = <; ::1 ; HOSTIPV4

send_to_server2:
@@ -53,6 +54,7 @@ send_to_server2:
allow_localhost
hosts = ${if eq {$local_part}{user4} {127.0.0.1} {<; ::1}}
port = PORT_D
+ hosts_try_fastopen = :
interface = <; HOSTIPV6 ; HOSTIPV4

send_to_server3:
@@ -60,6 +62,7 @@ send_to_server3:
allow_localhost
hosts = ${if eq {$local_part}{user4} {127.0.0.1} {<; ::1}}
port = PORT_D
+ hosts_try_fastopen = :
interface = <; ${if eq{0}{1}{HOSTIPV6}fail}

send_to_server4:
@@ -67,6 +70,7 @@ send_to_server4:
allow_localhost
hosts = ${if eq {$local_part}{user4} {127.0.0.1} {<; ::1}}
port = PORT_D
+ hosts_try_fastopen = :
interface = <; ${if eq{0}{1}{HOSTIPV6}{ }}

send_to_server5:
@@ -74,6 +78,7 @@ send_to_server5:
allow_localhost
hosts = ${if eq {$local_part}{user4} {127.0.0.1} {<; ::1}}
port = PORT_D
+ hosts_try_fastopen = :
interface = <; ${if

send_to_server:
@@ -81,6 +86,7 @@ send_to_server:
allow_localhost
hosts = ${if eq {$local_part}{user4} {127.0.0.1} {<; ::1}}
port = PORT_D
+ hosts_try_fastopen = :
interface = ${expand:$h_interface:}


diff --git a/test/confs/1005 b/test/confs/1005
index 3576793..1b01dc4 100644
--- a/test/confs/1005
+++ b/test/confs/1005
@@ -25,6 +25,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :



# End
diff --git a/test/confs/1006 b/test/confs/1006
index f46fba9..5f5dfd5 100644
--- a/test/confs/1006
+++ b/test/confs/1006
@@ -37,6 +37,7 @@ begin transports

 smtp:
   driver = smtp
+  hosts_try_fastopen =    :



 # End
diff --git a/test/confs/1008 b/test/confs/1008
index e330704..44c7153 100644
--- a/test/confs/1008
+++ b/test/confs/1008
@@ -26,6 +26,7 @@ begin transports
 t1:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :



 # ----- Retry -----
diff --git a/test/confs/1009 b/test/confs/1009
index fbfa7f0..c8184a6 100644
--- a/test/confs/1009
+++ b/test/confs/1009
@@ -38,6 +38,7 @@ begin transports
 t1:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :



 # ----- Retry -----
diff --git a/test/confs/2000 b/test/confs/2000
index 9ca325f..11104b0 100644
--- a/test/confs/2000
+++ b/test/confs/2000
@@ -48,6 +48,7 @@ send_to_server:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_certificate = DIR/aux-fixed/cert2
   tls_privatekey = DIR/aux-fixed/cert2
   tls_verify_certificates = DIR/aux-fixed/cert2
diff --git a/test/confs/2001 b/test/confs/2001
index 715da4b..d6525ca 100644
--- a/test/confs/2001
+++ b/test/confs/2001
@@ -49,6 +49,7 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
+  hosts_try_fastopen =    :
   OPTION
   port = PORT_D
   tls_certificate = DIR/aux-fixed/cert2
diff --git a/test/confs/2007 b/test/confs/2007
index a16b9a5..d666f6a 100644
--- a/test/confs/2007
+++ b/test/confs/2007
@@ -55,11 +55,13 @@ send_to_server1:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen =    :


 send_to_server2:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :


 # End
diff --git a/test/confs/2008 b/test/confs/2008
index 83b3050..1f12493 100644
--- a/test/confs/2008
+++ b/test/confs/2008
@@ -64,6 +64,7 @@ send_to_server1:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen =    :
   helo_data = helo.data.changed


 send_to_server2:
@@ -71,6 +72,7 @@ send_to_server2:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :



 # ----- Retry -----
diff --git a/test/confs/2009 b/test/confs/2009
index 59139f2..21f9f26 100644
--- a/test/confs/2009
+++ b/test/confs/2009
@@ -54,7 +54,8 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
-  hosts_avoid_tls = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen =    :
+  hosts_avoid_tls = 127.0.0.1


 # End
diff --git a/test/confs/2010 b/test/confs/2010
index 2cedb89..dae45a0 100644
--- a/test/confs/2010
+++ b/test/confs/2010
@@ -44,8 +44,9 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = HOSTS
-  hosts_require_tls = *
   port = PORT_D
+  hosts_try_fastopen =    :
+  hosts_require_tls = *



 # ----- Retry -----
diff --git a/test/confs/2012 b/test/confs/2012
index 8fbc555..f59b91a 100644
--- a/test/confs/2012
+++ b/test/confs/2012
@@ -93,8 +93,9 @@ send_to_server_failcert:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
-  hosts_require_tls = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
+  hosts_require_tls = HOSTIPV4
   tls_certificate = CERT2
   tls_privatekey = CERT2


@@ -107,8 +108,9 @@ send_to_server_retry:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1
-  hosts_require_tls = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
+  hosts_require_tls = HOSTIPV4
   tls_certificate = CERT2
   tls_privatekey = CERT2


@@ -122,8 +124,9 @@ send_to_server_crypt:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
-  hosts_require_tls = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
+  hosts_require_tls = HOSTIPV4
   tls_certificate = CERT2
   tls_privatekey = CERT2


@@ -137,6 +140,7 @@ send_to_server_req_fail:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_certificate = CERT2
   tls_privatekey = CERT2


@@ -150,6 +154,7 @@ send_to_server_req_fail:
    allow_localhost
    hosts = HOSTIPV4
    port = PORT_D
+  hosts_try_fastopen =    :
    tls_certificate = CERT2
    tls_privatekey = CERT2


@@ -163,6 +168,7 @@ send_to_server_req_fail:
    allow_localhost
    hosts = HOSTIPV4
    port = PORT_D
+  hosts_try_fastopen =    :
    tls_certificate = CERT2
    tls_privatekey = CERT2


diff --git a/test/confs/2013 b/test/confs/2013
index 4c9fcd3..1a23887 100644
--- a/test/confs/2013
+++ b/test/confs/2013
@@ -66,8 +66,9 @@ send_to_server:
   allow_localhost
   hosts_override
   hosts = 127.0.0.1
-  hosts_noproxy_tls = PEX
   port = PORT_D
+  hosts_try_fastopen =    :
+  hosts_noproxy_tls = PEX
   tls_try_verify_hosts = :


 # End
diff --git a/test/confs/2016 b/test/confs/2016
index b14e1f3..ead3a90 100644
--- a/test/confs/2016
+++ b/test/confs/2016
@@ -29,6 +29,7 @@ smtp:
   command_timeout = 1s
   hosts_require_tls = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen =    :



 # ----- Retry -----
diff --git a/test/confs/2017 b/test/confs/2017
index a699f2d..98fdc07 100644
--- a/test/confs/2017
+++ b/test/confs/2017
@@ -53,8 +53,9 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
-  hosts_nopass_tls = *
   port = PORT_D
+  hosts_try_fastopen =    :
+  hosts_nopass_tls = *



 # ----- Retry -----
diff --git a/test/confs/2021 b/test/confs/2021
index ccd2017..a7e89f8 100644
--- a/test/confs/2021
+++ b/test/confs/2021
@@ -28,6 +28,7 @@ send_to_server:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen =    :
   REQUIRE
   TRYCLEAR


diff --git a/test/confs/2025 b/test/confs/2025
index fdf1e04..8c08abe 100644
--- a/test/confs/2025
+++ b/test/confs/2025
@@ -45,6 +45,7 @@ send_to_server:
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen =    :
   hosts_require_tls = HOSTIPV4
   tls_require_ciphers = NORMAL:-VERS-ALL:+VERS-TLS1.2:-MAC-ALL:+SHA\
      ${if eq{$host}{HOSTIPV4} {384} {256} }
diff --git a/test/confs/2026 b/test/confs/2026
index c678219..270a068 100644
--- a/test/confs/2026
+++ b/test/confs/2026
@@ -63,6 +63,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
   allow_localhost


 t2:
diff --git a/test/confs/2030 b/test/confs/2030
index e2ee0e2..490b35f 100644
--- a/test/confs/2030
+++ b/test/confs/2030
@@ -53,6 +53,7 @@ send_to_server1:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_sni = fred


 send_to_server2:
@@ -60,6 +61,7 @@ send_to_server2:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :



 # ----- Retry -----
diff --git a/test/confs/2031 b/test/confs/2031
index 0d9bba6..af27b2f 100644
--- a/test/confs/2031
+++ b/test/confs/2031
@@ -65,6 +65,7 @@ send_to_server1:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_sni = fred


 send_to_server2:
@@ -72,6 +73,7 @@ send_to_server2:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_sni = bill



diff --git a/test/confs/2033 b/test/confs/2033
index 73dcde6..15e632a 100644
--- a/test/confs/2033
+++ b/test/confs/2033
@@ -100,8 +100,9 @@ send_to_server_failcert:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
-  hosts_require_tls = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
+  hosts_require_tls = HOSTIPV4
   tls_certificate = CERT2
   tls_privatekey = CERT2


@@ -112,8 +113,9 @@ send_to_server_retry:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1
-  hosts_require_tls = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
+  hosts_require_tls = HOSTIPV4
   tls_certificate = CERT2
   tls_privatekey = CERT2


@@ -125,8 +127,9 @@ send_to_server_crypt:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
-  hosts_require_tls = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
+  hosts_require_tls = HOSTIPV4
   tls_certificate = CERT2
   tls_privatekey = CERT2


@@ -140,6 +143,7 @@ send_to_server_req_fail:
   allow_localhost
   hosts = HOSTNAME
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_certificate = CERT2
   tls_privatekey = CERT2


@@ -153,6 +157,7 @@ send_to_server_req_failname:
   allow_localhost
   hosts = HOSTNAME
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_certificate = CERT2
   tls_privatekey = CERT2


@@ -167,6 +172,7 @@ send_to_server_req_passname:
   allow_localhost
   hosts = server1.example.com
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_certificate = CERT2
   tls_privatekey = CERT2


@@ -181,6 +187,7 @@ send_to_server_req_failcarryon:
   allow_localhost
   hosts = HOSTNAME
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_certificate = CERT2
   tls_privatekey = CERT2


diff --git a/test/confs/2100 b/test/confs/2100
index bce339b..827d938 100644
--- a/test/confs/2100
+++ b/test/confs/2100
@@ -49,6 +49,7 @@ send_to_server:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen = :
   tls_certificate = DIR/aux-fixed/cert2
   tls_privatekey = DIR/aux-fixed/cert2
   tls_verify_certificates = DIR/aux-fixed/cert2
diff --git a/test/confs/2101 b/test/confs/2101
index a0e1fe4..32c3096 100644
--- a/test/confs/2101
+++ b/test/confs/2101
@@ -46,6 +46,7 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
+  hosts_try_fastopen =    :
   OPTION
   port = PORT_D
   tls_certificate = DIR/aux-fixed/cert2
diff --git a/test/confs/2107 b/test/confs/2107
index 9487445..5cf1dc3 100644
--- a/test/confs/2107
+++ b/test/confs/2107
@@ -54,11 +54,13 @@ send_to_server1:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen = :


send_to_server2:
driver = smtp
allow_localhost
hosts = HOSTIPV4
port = PORT_D
+ hosts_try_fastopen = :

# End
diff --git a/test/confs/2108 b/test/confs/2108
index 9b926bf..5db771d 100644
--- a/test/confs/2108
+++ b/test/confs/2108
@@ -62,6 +62,7 @@ send_to_server1:
allow_localhost
hosts = 127.0.0.1
port = PORT_D
+ hosts_try_fastopen = :
helo_data = helo.data.changed

send_to_server2:
@@ -69,6 +70,7 @@ send_to_server2:
allow_localhost
hosts = HOSTIPV4
port = PORT_D
+ hosts_try_fastopen = :


 # ----- Retry -----
diff --git a/test/confs/2109 b/test/confs/2109
index 8703d19..3f1465f 100644
--- a/test/confs/2109
+++ b/test/confs/2109
@@ -54,7 +54,8 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
-  hosts_avoid_tls = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen =    :
+  hosts_avoid_tls = 127.0.0.1


# End
diff --git a/test/confs/2110 b/test/confs/2110
index 72754a6..cc4a7f0 100644
--- a/test/confs/2110
+++ b/test/confs/2110
@@ -43,8 +43,9 @@ send_to_server:
driver = smtp
allow_localhost
hosts = HOSTS
- hosts_require_tls = *
port = PORT_D
+ hosts_try_fastopen = :
+ hosts_require_tls = *


# ----- Retry -----
diff --git a/test/confs/2111 b/test/confs/2111
index b54c949..42458ef 100644
--- a/test/confs/2111
+++ b/test/confs/2111
@@ -46,8 +46,9 @@ send_to_server:
driver = smtp
allow_localhost
hosts = HOSTIPV4 : 127.0.0.1
- hosts_require_tls = HOSTIPV4
port = PORT_D
+ hosts_try_fastopen = :
+ hosts_require_tls = HOSTIPV4
tls_certificate = DIR/aux-fixed/cert2
tls_privatekey = DIR/aux-fixed/cert2
tls_require_ciphers = IDEA-CBC-MD5:\
diff --git a/test/confs/2112 b/test/confs/2112
index 005925e..2b3f33e 100644
--- a/test/confs/2112
+++ b/test/confs/2112
@@ -93,8 +93,9 @@ send_to_server_failcert:
driver = smtp
allow_localhost
hosts = HOSTIPV4
- hosts_require_tls = HOSTIPV4
port = PORT_D
+ hosts_try_fastopen = :
+ hosts_require_tls = HOSTIPV4
tls_certificate = CERT2
tls_privatekey = CERT2

@@ -107,8 +108,9 @@ send_to_server_retry:
driver = smtp
allow_localhost
hosts = HOSTIPV4 : 127.0.0.1
- hosts_require_tls = HOSTIPV4
port = PORT_D
+ hosts_try_fastopen = :
+ hosts_require_tls = HOSTIPV4
tls_certificate = CERT2
tls_privatekey = CERT2

@@ -122,8 +124,9 @@ send_to_server_crypt:
driver = smtp
allow_localhost
hosts = HOSTIPV4
- hosts_require_tls = HOSTIPV4
port = PORT_D
+ hosts_try_fastopen = :
+ hosts_require_tls = HOSTIPV4
tls_certificate = CERT2
tls_privatekey = CERT2

@@ -137,6 +140,7 @@ send_to_server_req_fail:
allow_localhost
hosts = HOSTIPV4
port = PORT_D
+ hosts_try_fastopen = :
tls_certificate = CERT2
tls_privatekey = CERT2

@@ -150,6 +154,7 @@ send_to_server_req_failname:
    allow_localhost
    hosts = HOSTIPV4
    port = PORT_D
+  hosts_try_fastopen = :
    tls_certificate = CERT2
    tls_privatekey = CERT2


@@ -163,6 +168,7 @@ send_to_server_req_passname:
    allow_localhost
    hosts = HOSTIPV4
    port = PORT_D
+  hosts_try_fastopen = :
    tls_certificate = CERT2
    tls_privatekey = CERT2


diff --git a/test/confs/2113 b/test/confs/2113
index f48e618..eb9d2b4 100644
--- a/test/confs/2113
+++ b/test/confs/2113
@@ -66,8 +66,9 @@ send_to_server:
   allow_localhost
   hosts_override
   hosts = 127.0.0.1
-  hosts_noproxy_tls = PEX
   port = PORT_D
+  hosts_try_fastopen =    :
+  hosts_noproxy_tls = PEX
   tls_try_verify_hosts = :


 # End
diff --git a/test/confs/2116 b/test/confs/2116
index d57d3a1..77a6712 100644
--- a/test/confs/2116
+++ b/test/confs/2116
@@ -27,8 +27,9 @@ begin transports
 smtp:
   driver = smtp
   command_timeout = 1s
-  hosts_require_tls = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen =    :
+  hosts_require_tls = 127.0.0.1



# ----- Retry -----
diff --git a/test/confs/2117 b/test/confs/2117
index b6a5576..cdec830 100644
--- a/test/confs/2117
+++ b/test/confs/2117
@@ -53,9 +53,10 @@ send_to_server:
driver = smtp
allow_localhost
hosts = 127.0.0.1
- hosts_nopass_tls = *
port = PORT_D
+ hosts_try_fastopen = :
tls_try_verify_hosts = :
+ hosts_nopass_tls = *


# ----- Retry -----
diff --git a/test/confs/2120 b/test/confs/2120
index 1288d7f..9469cb7 100644
--- a/test/confs/2120
+++ b/test/confs/2120
@@ -36,6 +36,7 @@ t1:
hosts = thishost.test.ex
allow_localhost
port = PORT_D
+ hosts_try_fastopen = :


# ----- Retry -----
diff --git a/test/confs/2121 b/test/confs/2121
index 573ea37..6dcaa05 100644
--- a/test/confs/2121
+++ b/test/confs/2121
@@ -28,6 +28,7 @@ send_to_server:
allow_localhost
hosts = 127.0.0.1
port = PORT_S
+ hosts_try_fastopen = :
REQUIRE
TRYCLEAR

diff --git a/test/confs/2125 b/test/confs/2125
index 5898791..3591c86 100644
--- a/test/confs/2125
+++ b/test/confs/2125
@@ -48,9 +48,10 @@ send_to_server:
driver = smtp
allow_localhost
hosts = HOSTIPV4 : 127.0.0.1
+ port = PORT_D
hosts_require_tls = HOSTIPV4
tls_require_ciphers = AES128-SHA
- port = PORT_D
+ hosts_try_fastopen = :
tls_try_verify_hosts = :


diff --git a/test/confs/2126 b/test/confs/2126
index 9f0af7c..cb44813 100644
--- a/test/confs/2126
+++ b/test/confs/2126
@@ -51,6 +51,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
   allow_localhost
   tls_try_verify_hosts = :


diff --git a/test/confs/2127 b/test/confs/2127
index 9807ccf..65e1901 100644
--- a/test/confs/2127
+++ b/test/confs/2127
@@ -55,6 +55,7 @@ send_to_server:
   allow_localhost
   hosts = ${if eq{$local_part}{userx}{127.0.0.1}{HOSTIPV4}}
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_try_verify_hosts = :


 # End
diff --git a/test/confs/2130 b/test/confs/2130
index 379d2c9..4afded1 100644
--- a/test/confs/2130
+++ b/test/confs/2130
@@ -53,6 +53,7 @@ send_to_server1:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_sni = fred
   tls_try_verify_hosts = :


@@ -61,6 +62,7 @@ send_to_server2:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_try_verify_hosts = :



diff --git a/test/confs/2131 b/test/confs/2131
index 43db2ac..243fc09 100644
--- a/test/confs/2131
+++ b/test/confs/2131
@@ -65,6 +65,7 @@ send_to_server1:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_sni = fred
   hosts_require_tls = *
   tls_try_verify_hosts = :
@@ -74,6 +75,7 @@ send_to_server2:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_sni = bill
   hosts_require_tls = *
   tls_try_verify_hosts = :
diff --git a/test/confs/2133 b/test/confs/2133
index e58a0c6..463e614 100644
--- a/test/confs/2133
+++ b/test/confs/2133
@@ -101,8 +101,9 @@ send_to_server_failcert:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
-  hosts_require_tls = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
+  hosts_require_tls = HOSTIPV4
   tls_certificate = CERT2
   tls_privatekey = CERT2


@@ -113,8 +114,9 @@ send_to_server_retry:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1
-  hosts_require_tls = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
+  hosts_require_tls = HOSTIPV4
   tls_certificate = CERT2
   tls_privatekey = CERT2


@@ -126,8 +128,9 @@ send_to_server_crypt:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
-  hosts_require_tls = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
+  hosts_require_tls = HOSTIPV4
   tls_certificate = CERT2
   tls_privatekey = CERT2


@@ -141,6 +144,7 @@ send_to_server_req_fail:
   allow_localhost
   hosts = HOSTNAME
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_certificate = CERT2
   tls_privatekey = CERT2


@@ -154,6 +158,7 @@ send_to_server_req_failname:
   allow_localhost
   hosts = HOSTNAME
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_certificate = CERT2
   tls_privatekey = CERT2


@@ -168,6 +173,7 @@ send_to_server_req_passname:
   allow_localhost
   hosts = server1.example.com
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_certificate = CERT2
   tls_privatekey = CERT2


@@ -180,6 +186,7 @@ send_to_server_req_failcarryon:
   allow_localhost
   hosts = HOSTNAME
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_certificate = CERT2
   tls_privatekey = CERT2


diff --git a/test/confs/2135 b/test/confs/2135
index f7f2257..4625f75 100644
--- a/test/confs/2135
+++ b/test/confs/2135
@@ -67,6 +67,7 @@ begin transports

 t1:
   driver =    smtp
+  hosts_try_fastopen =    :
   tls_verify_certificates =    DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =    :


diff --git a/test/confs/2138 b/test/confs/2138
index 7fec825..d5dba1b 100644
--- a/test/confs/2138
+++ b/test/confs/2138
@@ -57,8 +57,9 @@ local_delivery:
 send_to_server:
   driver =    smtp
   allow_localhost
-  hosts_noproxy_tls = :
   port =    PORT_D
+  hosts_try_fastopen =    :
+  hosts_noproxy_tls = :
   tls_try_verify_hosts = :
   max_rcpt =    1


diff --git a/test/confs/2149 b/test/confs/2149
index 072e8e4..ee48a51 100644
--- a/test/confs/2149
+++ b/test/confs/2149
@@ -50,6 +50,7 @@ send_to_server:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_try_verify_hosts = :


 # End
diff --git a/test/confs/2151 b/test/confs/2151
index f64cdd5..1e40a83 100644
--- a/test/confs/2151
+++ b/test/confs/2151
@@ -39,5 +39,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :


 # End
diff --git a/test/confs/2152 b/test/confs/2152
index f783192..a5acff0 100644
--- a/test/confs/2152
+++ b/test/confs/2152
@@ -53,6 +53,7 @@ send_to_server:
   allow_localhost
   hosts =    127.0.0.1
   port =    PORT_D
+  hosts_try_fastopen =    :
   tls_verify_certificates = DIR/aux-fixed/cert1
   tls_verify_cert_hostnames = :


@@ -61,6 +62,7 @@ send_to_server_v:
   allow_localhost
   hosts =    127.0.0.1
   port =    PORT_D2
+  hosts_try_fastopen =    :
   tls_verify_certificates = DIR/aux-fixed/cert1
   tls_verify_cert_hostnames = :


diff --git a/test/confs/2201 b/test/confs/2201
index dce78ed..4ce7925 100644
--- a/test/confs/2201
+++ b/test/confs/2201
@@ -75,6 +75,7 @@ remote_delivery:
   hosts = 127.0.0.1
   allow_localhost
   port = PORT_D
+  hosts_try_fastopen =    :


# ----- Retry -----

diff --git a/test/confs/3207 b/test/confs/3207
index 6880dcf..bf8d1d4 100644
--- a/test/confs/3207
+++ b/test/confs/3207
@@ -82,6 +82,7 @@ local_delivery:

 smtp:
   driver = smtp
+  hosts_try_fastopen =    :



# ----- Retry -----
diff --git a/test/confs/3209 b/test/confs/3209
index d5a442d..fff1f37 100644
--- a/test/confs/3209
+++ b/test/confs/3209
@@ -28,6 +28,7 @@ begin transports

 smtp:
   driver = smtp
+  hosts_try_fastopen =    :
   connect_timeout = 1s



diff --git a/test/confs/3401 b/test/confs/3401
index afcd482..401d5cf 100644
--- a/test/confs/3401
+++ b/test/confs/3401
@@ -55,14 +55,16 @@ begin transports

 smtp_try:
   driver = smtp
-  hosts_try_auth = *
   port = PORT_S
+  hosts_try_fastopen =    :
+  hosts_try_auth = *
   authenticated_sender = ${if eq{$local_part}{forcesender}{force@???}fail}


 smtp_force:
   driver = smtp
-  hosts_require_auth = *
   port = PORT_S
+  hosts_try_fastopen =    :
+  hosts_require_auth = *



# ----- Retry -----
diff --git a/test/confs/3404 b/test/confs/3404
index a76581d..73cb524 100644
--- a/test/confs/3404
+++ b/test/confs/3404
@@ -43,8 +43,9 @@ begin transports

 smtp:
   driver = smtp
-  hosts_try_auth = *
   port = PORT_S
+  hosts_try_fastopen =    :
+  hosts_try_auth = *



# ----- Retry -----
diff --git a/test/confs/3405 b/test/confs/3405
index e9c7b7e..9f37f01 100644
--- a/test/confs/3405
+++ b/test/confs/3405
@@ -37,8 +37,9 @@ begin transports

 smtp:
   driver = smtp
+  port = PORT_S
+  hosts_try_fastopen =    :
   headers_add = X-TAID: >$authenticated_id<
   hosts_try_auth = *
-  port = PORT_S


 # End
diff --git a/test/confs/3412 b/test/confs/3412
index c0a1c55..5284943 100644
--- a/test/confs/3412
+++ b/test/confs/3412
@@ -44,6 +44,7 @@ smtp:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen =    :
   hosts_try_auth = *


 # End
diff --git a/test/confs/3416 b/test/confs/3416
index 930a224..eebb132 100644
--- a/test/confs/3416
+++ b/test/confs/3416
@@ -51,6 +51,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen =    :
   allow_localhost
   hosts_try_auth = *


@@ -58,6 +59,7 @@ t2:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen =    :
   allow_localhost
   hosts_try_auth = *
   authenticated_sender= brian
diff --git a/test/confs/3451 b/test/confs/3451
index c3f07b9..160f9e0 100644
--- a/test/confs/3451
+++ b/test/confs/3451
@@ -69,8 +69,9 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
+  port = PORT_D
+  hosts_try_fastopen =    :
   hosts_try_auth = *
   hosts_noproxy_tls = PEX
-  port = PORT_D


 # End
diff --git a/test/confs/3452 b/test/confs/3452
index 5971c08..108d93e 100644
--- a/test/confs/3452
+++ b/test/confs/3452
@@ -67,8 +67,9 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
-  hosts_try_auth = *
   port = PORT_D
+  hosts_try_fastopen =    :
+  hosts_try_auth = *



 # ----- Retry -----
diff --git a/test/confs/3455 b/test/confs/3455
index bfa30b4..591d5de 100644
--- a/test/confs/3455
+++ b/test/confs/3455
@@ -61,6 +61,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen =    :
   hosts_avoid_tls = HOSTS_AVOID_TLS
   hosts_require_auth = *
   allow_localhost
diff --git a/test/confs/3461 b/test/confs/3461
index a01a8b2..35c2a17 100644
--- a/test/confs/3461
+++ b/test/confs/3461
@@ -69,9 +69,10 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
+  port = PORT_D
+  hosts_try_fastopen =    :
   hosts_try_auth = *
   hosts_noproxy_tls = PEX
-  port = PORT_D
   tls_try_verify_hosts = :


 # End
diff --git a/test/confs/3462 b/test/confs/3462
index 33fabbc..3f8c401 100644
--- a/test/confs/3462
+++ b/test/confs/3462
@@ -67,8 +67,9 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
-  hosts_try_auth = *
   port = PORT_D
+  hosts_try_fastopen =    :
+  hosts_try_auth = *
   tls_try_verify_hosts = :



diff --git a/test/confs/3465 b/test/confs/3465
index dfe6b99..0d97a3a 100644
--- a/test/confs/3465
+++ b/test/confs/3465
@@ -61,6 +61,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen =    :
   hosts_avoid_tls = HOSTS_AVOID_TLS
   tls_try_verify_hosts = :
   hosts_require_auth = *
diff --git a/test/confs/3501 b/test/confs/3501
index c63e767..b283a2d 100644
--- a/test/confs/3501
+++ b/test/confs/3501
@@ -43,14 +43,16 @@ begin transports


 smtp_try:
   driver = smtp
-  hosts_try_auth = *
   port = PORT_S
+  hosts_try_fastopen =    :
+  hosts_try_auth = *
   authenticated_sender = ${if eq{$local_part}{forcesender}{force@???}fail}


 smtp_force:
   driver = smtp
-  hosts_require_auth = *
   port = PORT_S
+  hosts_try_fastopen =    :
+  hosts_require_auth = *



 # ----- Retry -----
diff --git a/test/confs/3600 b/test/confs/3600
index f6d4f86..e955676 100644
--- a/test/confs/3600
+++ b/test/confs/3600
@@ -63,6 +63,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen =    :
   allow_localhost
   hosts_require_auth = *


diff --git a/test/confs/3700 b/test/confs/3700
index 6578ecb..39e3bce 100644
--- a/test/confs/3700
+++ b/test/confs/3700
@@ -76,6 +76,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen =    :
   allow_localhost
   tls_certificate =         DIR/aux-fixed/cert2
   tls_verify_certificates = DIR/aux-fixed/cert1
@@ -85,6 +86,7 @@ t2:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen =    :
   protocol = smtps
   allow_localhost
   tls_certificate =         DIR/aux-fixed/cert2
diff --git a/test/confs/3720 b/test/confs/3720
index 6d8c467..53a68d3 100644
--- a/test/confs/3720
+++ b/test/confs/3720
@@ -79,6 +79,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen =    :
   allow_localhost
   tls_certificate =        DIR/aux-fixed/cert2
   tls_verify_certificates =    DIR/aux-fixed/cert1
diff --git a/test/confs/4028 b/test/confs/4028
index 4a1f682..16f464c 100644
--- a/test/confs/4028
+++ b/test/confs/4028
@@ -48,6 +48,7 @@ begin transports
 my_smtp:
   driver = smtp
   port = PORT_D
+  hosts_try_fastopen =    :
   socks_proxy = 127.0.0.1 port=1080 OPT
   tls_certificate = DIR/aux-fixed/cert2
   tls_privatekey = DIR/aux-fixed/cert2
diff --git a/test/confs/4029 b/test/confs/4029
index 467d74d..119f8ce 100644
--- a/test/confs/4029
+++ b/test/confs/4029
@@ -48,6 +48,7 @@ begin transports
 my_smtp:
   driver = smtp
   port = PORT_D
+  hosts_try_fastopen =    :
   socks_proxy = 127.0.0.1 port=1080 OPT
   tls_certificate = DIR/aux-fixed/cert2
   tls_privatekey = DIR/aux-fixed/cert2
diff --git a/test/confs/4201 b/test/confs/4201
index 17afe9f..8ded6c2 100644
--- a/test/confs/4201
+++ b/test/confs/4201
@@ -124,6 +124,7 @@ local_delivery:


 rmt_smtp:
   driver = smtp
+  hosts_try_fastopen =    :
 .ifdef STRICT
   utf8_downconvert = STRICT
 .endif
diff --git a/test/confs/4211 b/test/confs/4211
index bcd5a4f..e68111e 100644
--- a/test/confs/4211
+++ b/test/confs/4211
@@ -115,6 +115,7 @@ local_delivery:


 rmt_smtp:
   driver = smtp
+  hosts_try_fastopen =    :
   hosts_require_tls = *
   tls_try_verify_hosts = :


diff --git a/test/confs/4221 b/test/confs/4221
index bcd5a4f..e68111e 100644
--- a/test/confs/4221
+++ b/test/confs/4221
@@ -115,6 +115,7 @@ local_delivery:

 rmt_smtp:
   driver = smtp
+  hosts_try_fastopen =    :
   hosts_require_tls = *
   tls_try_verify_hosts = :


diff --git a/test/confs/4520 b/test/confs/4520
index 1f31623..3f49ca9 100644
--- a/test/confs/4520
+++ b/test/confs/4520
@@ -45,6 +45,7 @@ send_to_server:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :


   dkim_domain =        test.ex
 .ifdef SELECTOR
diff --git a/test/confs/4525 b/test/confs/4525
index f6a0258..e11456c 100644
--- a/test/confs/4525
+++ b/test/confs/4525
@@ -68,6 +68,7 @@ send_to_server:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :


 .ifdef FILTER
   transport_filter =    /bin/cat - DIR/aux-fixed/TESTNUM.mlistfooter
diff --git a/test/confs/4550 b/test/confs/4550
index 15178f3..4b596f3 100644
--- a/test/confs/4550
+++ b/test/confs/4550
@@ -49,6 +49,7 @@ send_to_server:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :


   dkim_domain =        ${if def:sender_address_local_part {test.ex}}
   dkim_selector =    sel
diff --git a/test/confs/4700 b/test/confs/4700
index 96f3bea..86d8b6d 100644
--- a/test/confs/4700
+++ b/test/confs/4700
@@ -48,6 +48,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :


 local_delivery:
   driver = appendfile
diff --git a/test/confs/4800 b/test/confs/4800
index 876e81d..f342f28 100644
--- a/test/confs/4800
+++ b/test/confs/4800
@@ -12,3 +12,4 @@ begin routers
 begin transports
   smtp:
      driver = smtp
+  hosts_try_fastopen =    :
diff --git a/test/confs/4801 b/test/confs/4801
index 9a09b02..5241ad3 100644
--- a/test/confs/4801
+++ b/test/confs/4801
@@ -12,3 +12,4 @@ begin routers
 begin transports
   smtp:
      driver = smtp
+  hosts_try_fastopen =    :
diff --git a/test/confs/4802 b/test/confs/4802
index b37eba7..47e2e6e 100644
--- a/test/confs/4802
+++ b/test/confs/4802
@@ -12,3 +12,4 @@ begin routers
 begin transports
   smtp:
      driver = smtp
+  hosts_try_fastopen =    :
diff --git a/test/confs/4803 b/test/confs/4803
index bb2afff..41381a4 100644
--- a/test/confs/4803
+++ b/test/confs/4803
@@ -13,3 +13,4 @@ begin routers
 begin transports
   smtp:
      driver = smtp
+  hosts_try_fastopen =    :
diff --git a/test/confs/4804 b/test/confs/4804
index a891d14..1513d46 100644
--- a/test/confs/4804
+++ b/test/confs/4804
@@ -40,5 +40,6 @@ begin transports
 send_to_server:
   driver = smtp
   port = PORT_D
+  hosts_try_fastopen =    :


# End
diff --git a/test/confs/4950 b/test/confs/4950
index 6ddee03..c4395b5 100644
--- a/test/confs/4950
+++ b/test/confs/4950
@@ -32,6 +32,7 @@ begin transports

 smtp:
   driver = smtp
+  hosts_try_fastopen =    :



# End
diff --git a/test/confs/5204 b/test/confs/5204
index 5f379b8..e81c58e 100644
--- a/test/confs/5204
+++ b/test/confs/5204
@@ -51,9 +51,11 @@ begin transports

 smtp:
   driver = smtp
+  hosts_try_fastopen =    :


 other_smtp:
   driver = smtp
+  hosts_try_fastopen =    :


 null:
   driver = appendfile
diff --git a/test/confs/5205 b/test/confs/5205
index efa2de1..4eeee70 100644
--- a/test/confs/5205
+++ b/test/confs/5205
@@ -27,5 +27,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :


 # End
diff --git a/test/confs/5206 b/test/confs/5206
index 37e89e6..27aff6e 100644
--- a/test/confs/5206
+++ b/test/confs/5206
@@ -29,6 +29,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :



# ----- Retry -----
diff --git a/test/confs/5208 b/test/confs/5208
index e32dcfc..988183b 100644
--- a/test/confs/5208
+++ b/test/confs/5208
@@ -28,5 +28,6 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :


# End
diff --git a/test/confs/5300 b/test/confs/5300
index 1ba8938..165e0ea 100644
--- a/test/confs/5300
+++ b/test/confs/5300
@@ -19,6 +19,7 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :


# ----- Routers -----

diff --git a/test/confs/5301 b/test/confs/5301
index f727ebc..7bc161d 100644
--- a/test/confs/5301
+++ b/test/confs/5301
@@ -20,6 +20,7 @@ begin transports

 t1:
   driver = smtp
+  hosts_try_fastopen =    :


# ----- Routers -----

diff --git a/test/confs/5400 b/test/confs/5400
index 980e02a..9693818 100644
--- a/test/confs/5400
+++ b/test/confs/5400
@@ -65,12 +65,14 @@ smtp:
   driver = smtp
   interface = HOSTIPV4
   port = PORT_S
+  hosts_try_fastopen =    :
   headers_add =  ${if def:h_X-hdr-rtr {X-hdr-tpt-new: new} {}}


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



 # End
diff --git a/test/confs/5401 b/test/confs/5401
index 0d93fe5..2b1a4c4 100644
--- a/test/confs/5401
+++ b/test/confs/5401
@@ -40,6 +40,7 @@ smtp:
   driver = smtp
   interface = HOSTIPV4
   port = PORT_S
+  hosts_try_fastopen =    :



 # End
diff --git a/test/confs/5402 b/test/confs/5402
index 0984e0c..92c5632 100644
--- a/test/confs/5402
+++ b/test/confs/5402
@@ -42,6 +42,7 @@ smtp:
   driver = smtp
   interface = HOSTIPV4
   port = PORT_S
+  hosts_try_fastopen =    :



 # End
diff --git a/test/confs/5403 b/test/confs/5403
index a4576a5..a95334b 100644
--- a/test/confs/5403
+++ b/test/confs/5403
@@ -53,12 +53,14 @@ smtp:
   driver = smtp
   interface = HOSTIPV4
   port = PORT_S
+  hosts_try_fastopen =    :
   headers_add =  ${if def:h_X-hdr-rtr {X-hdr-tpt-new: new} {}}


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



 # End
diff --git a/test/confs/5410 b/test/confs/5410
index 96ec874..e002343 100644
--- a/test/confs/5410
+++ b/test/confs/5410
@@ -47,6 +47,7 @@ smtp:
   driver = smtp
   interface = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
   hosts_avoid_tls =        ${if eq {$address_data}{usery}{*}{:}}
   hosts_verify_avoid_tls = ${if eq {$address_data}{userz}{*}{:}}
   tls_try_verify_hosts = :
diff --git a/test/confs/5420 b/test/confs/5420
index 44a1fde..488000e 100644
--- a/test/confs/5420
+++ b/test/confs/5420
@@ -47,6 +47,7 @@ smtp:
   driver = smtp
   interface = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
   hosts_avoid_tls =        ${if eq {$address_data}{usery}{*}{:}}
   hosts_verify_avoid_tls = ${if eq {$address_data}{userz}{*}{:}}


diff --git a/test/confs/5510 b/test/confs/5510
index ab42b24..9c01e63 100644
--- a/test/confs/5510
+++ b/test/confs/5510
@@ -37,6 +37,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen =    :
   allow_localhost
   hosts_try_prdr = *


diff --git a/test/confs/5601 b/test/confs/5601
index 9b33101..fdd3d80 100644
--- a/test/confs/5601
+++ b/test/confs/5601
@@ -94,6 +94,7 @@ send_to_server1:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =
   hosts_require_tls = *
@@ -107,6 +108,7 @@ send_to_server2:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =
   hosts_require_tls = *
@@ -120,6 +122,7 @@ send_to_server3:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen =    :
   helo_data = helo.data.changed
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =
@@ -134,6 +137,7 @@ send_to_server4:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen =    :
   helo_data = helo.data.changed
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =
diff --git a/test/confs/5611 b/test/confs/5611
index 0b2be46..9ba6350 100644
--- a/test/confs/5611
+++ b/test/confs/5611
@@ -94,6 +94,7 @@ send_to_server1:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =
   hosts_require_tls = *
@@ -107,6 +108,7 @@ send_to_server2:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =
   hosts_require_tls = *
@@ -120,6 +122,7 @@ send_to_server3:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen =    :
   helo_data = helo.data.changed
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =
@@ -134,6 +137,7 @@ send_to_server4:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen =    :
   helo_data = helo.data.changed
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =
diff --git a/test/confs/5651 b/test/confs/5651
index 01fa455..1e3ed5a 100644
--- a/test/confs/5651
+++ b/test/confs/5651
@@ -92,6 +92,7 @@ send_to_server1:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =
   hosts_require_tls = *
@@ -105,6 +106,7 @@ send_to_server2:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =
   hosts_require_tls = *
@@ -118,6 +120,7 @@ send_to_server3:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen =    :
   helo_data = helo.data.changed
   #tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
@@ -134,6 +137,7 @@ send_to_server4:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen =    :
   helo_data = helo.data.changed
   #tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
diff --git a/test/confs/5652 b/test/confs/5652
index da6e519..673ec66 100644
--- a/test/confs/5652
+++ b/test/confs/5652
@@ -74,6 +74,7 @@ begin transports
 remote_delivery:
   driver =            smtp
   port =            PORT_D
+  hosts_try_fastopen =        :
   hosts_require_tls =        *
 .ifdef _HAVE_GNUTLS
   tls_require_ciphers =        NONE:\
diff --git a/test/confs/5700 b/test/confs/5700
index 774e766..758d7d1 100644
--- a/test/confs/5700
+++ b/test/confs/5700
@@ -43,6 +43,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :
   command_timeout = 1s
   final_timeout = 1s
   event_action =   ${acl {logger}}
diff --git a/test/confs/5702 b/test/confs/5702
index dfc063f..e796406 100644
--- a/test/confs/5702
+++ b/test/confs/5702
@@ -38,6 +38,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :
   event_action = ${acl {logger}}


 # End
diff --git a/test/confs/5703 b/test/confs/5703
index 267f5fc..becd005 100644
--- a/test/confs/5703
+++ b/test/confs/5703
@@ -38,6 +38,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :
   event_action = ${acl {logger}}


 # End
diff --git a/test/confs/5710 b/test/confs/5710
index 85293a5..f6b9794 100644
--- a/test/confs/5710
+++ b/test/confs/5710
@@ -95,6 +95,7 @@ send_to_server:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen =    :


   tls_certificate = DIR/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem
   tls_privatekey = DIR/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key
diff --git a/test/confs/5720 b/test/confs/5720
index 9062662..2c0e327 100644
--- a/test/confs/5720
+++ b/test/confs/5720
@@ -95,6 +95,7 @@ send_to_server:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen =    :


   tls_certificate = DIR/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem
   tls_privatekey = DIR/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key
diff --git a/test/confs/5730 b/test/confs/5730
index 2b32008..c7d07bf 100644
--- a/test/confs/5730
+++ b/test/confs/5730
@@ -100,6 +100,7 @@ send_to_server1:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =
   hosts_require_tls = *
@@ -114,6 +115,7 @@ send_to_server2:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =
   hosts_require_tls = *
@@ -128,6 +130,7 @@ send_to_server3:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen =    :
   helo_data = helo.data.changed
   #tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
@@ -145,6 +148,7 @@ send_to_server4:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen =    :
   helo_data = helo.data.changed
   #tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
diff --git a/test/confs/5740 b/test/confs/5740
index 53302c5..60c175b 100644
--- a/test/confs/5740
+++ b/test/confs/5740
@@ -102,6 +102,7 @@ send_to_server1:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_verify_certificates =    DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =
   hosts_require_tls =    *
@@ -115,6 +116,7 @@ send_to_server2:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_verify_certificates =    DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =
   hosts_require_tls =    *
@@ -128,6 +130,7 @@ send_to_server3:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen =    :
   helo_data = helo.data.changed
   tls_verify_certificates =    DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =
@@ -142,6 +145,7 @@ send_to_server4:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen =    :
   helo_data = helo.data.changed
   tls_verify_certificates =    DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =
diff --git a/test/confs/5820 b/test/confs/5820
index b038558..76dc75e 100644
--- a/test/confs/5820
+++ b/test/confs/5820
@@ -66,6 +66,7 @@ send_to_server:
   driver = smtp
   allow_localhost
   port = PORT_D
+  hosts_try_fastopen =    :


   hosts_try_dane =     CONTROL
   hosts_require_dane = HOSTIPV4
diff --git a/test/confs/5840 b/test/confs/5840
index bda328a..5852ef2 100644
--- a/test/confs/5840
+++ b/test/confs/5840
@@ -71,6 +71,7 @@ send_to_server:
   driver = smtp
   allow_localhost
   port = PORT_D
+  hosts_try_fastopen =    :


   hosts_try_dane =     CONTROL
   hosts_require_dane = HOSTIPV4
diff --git a/test/confs/5860 b/test/confs/5860
index df91151..bef70dd 100644
--- a/test/confs/5860
+++ b/test/confs/5860
@@ -61,6 +61,7 @@ send_to_server:
   driver = smtp
   allow_localhost
   port = PORT_D
+  hosts_try_fastopen =    :


 #  hosts_try_dane = *
   hosts_require_dane = *
diff --git a/test/confs/5861 b/test/confs/5861
index 93e2bb7..68c790e 100644
--- a/test/confs/5861
+++ b/test/confs/5861
@@ -75,6 +75,7 @@ send_to_server:
   driver = smtp
   allow_localhost
   port = PORT_D
+  hosts_try_fastopen =    :


   hosts_try_dane =     *
   hosts_require_dane = HOSTIPV4
diff --git a/test/confs/5880 b/test/confs/5880
index 4becdd4..ef7c594 100644
--- a/test/confs/5880
+++ b/test/confs/5880
@@ -61,6 +61,7 @@ send_to_server:
   driver = smtp
   allow_localhost
   port = PORT_D
+  hosts_try_fastopen =    :


 #  hosts_try_dane = *
   hosts_require_dane = *
diff --git a/test/confs/5890 b/test/confs/5890
index f1aa9a2..5b154e5 100644
--- a/test/confs/5890
+++ b/test/confs/5890
@@ -100,6 +100,7 @@ send_to_server2:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_verify_certificates =    CDIR/CA/CA.pem
   tls_verify_cert_hostnames =    :
   event_action =        ${acl {log_resumption}}
diff --git a/test/confs/5891 b/test/confs/5891
index 190ce25..e0f8243 100644
--- a/test/confs/5891
+++ b/test/confs/5891
@@ -100,6 +100,7 @@ send_to_server2:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =    :
   tls_verify_certificates =    CDIR/CA/CA.pem
   tls_verify_cert_hostnames =    :
   event_action =        ${acl {log_resumption}}
diff --git a/test/confs/9900 b/test/confs/9900
index c042cd3..0f25f29 100644
--- a/test/confs/9900
+++ b/test/confs/9900
@@ -26,6 +26,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen =    :



 # ----- Retry -----
diff --git a/test/confs/9901 b/test/confs/9901
index 23ea43f..a33223b 100644
--- a/test/confs/9901
+++ b/test/confs/9901
@@ -47,6 +47,7 @@ t1:
   hosts = 127.0.0.1
   hosts_override
   port = PORT_D
+  hosts_try_fastopen =    :


 t2:
   driver = appendfile
diff --git a/test/confs/9903 b/test/confs/9903
index 7ef2c62..6f79e36 100644
--- a/test/confs/9903
+++ b/test/confs/9903
@@ -26,6 +26,7 @@ smtp:
   port = PORT_S
   hosts = 127.0.0.1
   allow_localhost
+  hosts_try_fastopen =    :



 # ----- Retry -----
diff --git a/test/runtest b/test/runtest
index c6fd5ce..3031504 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1245,7 +1245,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /^DKIM \[[^[]+\] (Header hash|b) computed:/;


     # Not all platforms support TCP Fast Open, and the compile omits the check
-    if (s/\S+ in hosts_try_fastopen\? (no \(option unset\)|yes \(matched "\*"\))\n$//)
+    if (s/\S+ in hosts_try_fastopen\? (no \(option unset\)|no \(end of list\)|yes \(matched "\*"\))\n$//)
       {
       chomp;
       $_ .= <IN>;
diff --git a/test/stderr/5204 b/test/stderr/5204
index 1f927a4..f84acad 100644
--- a/test/stderr/5204
+++ b/test/stderr/5204
@@ -242,7 +242,7 @@ some.name in helo_lookup_domains? no (end of list)
 host in dsn_advertise_hosts? no (option unset)
 host in pipelining_advertise_hosts? yes (matched "*")
 host in chunking_advertise_hosts? no (end of list)
-processing "accept" (TESTSUITE/test-config 76)
+processing "accept" (TESTSUITE/test-config 78)
 check verify = recipient

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

routing "FAIL cannot route this one (FAIL)"@???
diff --git a/test/stderr/5410 b/test/stderr/5410
index 5fc3c82..9953eee 100644
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -130,7 +130,7 @@ sync_responses expect rcpt
SMTP<< 250 Accepted
holding verify callout open for cutthrough delivery
----------- end cutthrough setup ------------
-processing "accept" (TESTSUITE/test-config 55)
+processing "accept" (TESTSUITE/test-config 56)
accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> DATA
@@ -383,7 +383,7 @@ sync_responses expect rcpt
SMTP<< 250 Accepted
holding verify callout open for cutthrough delivery
----------- end cutthrough setup ------------
-processing "accept" (TESTSUITE/test-config 55)
+processing "accept" (TESTSUITE/test-config 56)
accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> DATA
@@ -636,7 +636,7 @@ sync_responses expect rcpt
SMTP<< 250 Accepted
holding verify callout open for cutthrough delivery
----------- end cutthrough setup ------------
-processing "accept" (TESTSUITE/test-config 55)
+processing "accept" (TESTSUITE/test-config 56)
accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> DATA
diff --git a/test/stderr/5420 b/test/stderr/5420
index e8ea2bc..d832543 100644
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -131,7 +131,7 @@ sync_responses expect rcpt
SMTP<< 250 Accepted
holding verify callout open for cutthrough delivery
----------- end cutthrough setup ------------
-processing "accept" (TESTSUITE/test-config 54)
+processing "accept" (TESTSUITE/test-config 55)
accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> DATA
@@ -384,7 +384,7 @@ sync_responses expect rcpt
SMTP<< 250 Accepted
holding verify callout open for cutthrough delivery
----------- end cutthrough setup ------------
-processing "accept" (TESTSUITE/test-config 54)
+processing "accept" (TESTSUITE/test-config 55)
accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> DATA
@@ -637,7 +637,7 @@ sync_responses expect rcpt
SMTP<< 250 Accepted
holding verify callout open for cutthrough delivery
----------- end cutthrough setup ------------
-processing "accept" (TESTSUITE/test-config 54)
+processing "accept" (TESTSUITE/test-config 55)
accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> DATA
diff --git a/test/stderr/5820 b/test/stderr/5820
index 21d5127..032f2b9 100644
--- a/test/stderr/5820
+++ b/test/stderr/5820
@@ -9,7 +9,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)

->>> processing "accept" (TESTSUITE/test-config 86)
+>>> processing "accept" (TESTSUITE/test-config 87)
>>> check verify = recipient/callout
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
>>> routing rcptuser@???

diff --git a/test/stderr/5840 b/test/stderr/5840
index bc9b18c..dbd4d23 100644
--- a/test/stderr/5840
+++ b/test/stderr/5840
@@ -9,7 +9,7 @@
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)

->>> processing "accept" (TESTSUITE/test-config 91)
+>>> processing "accept" (TESTSUITE/test-config 92)
>>> check verify = recipient/callout
>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
>>> routing rcptuser@???

diff --git a/test/stdout/0572 b/test/stdout/0572
index 44ced8c..06cc972 100644
--- a/test/stdout/0572
+++ b/test/stdout/0572
@@ -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
@@ -110,6 +110,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"
@@ -146,4 +147,5 @@ my_smtp:
 driver = smtp
 interface = ip4.ip4.ip4.ip4
 port = 1224
+hosts_try_fastopen = :
 debug_print = transport_name <$transport_name>