Testsuite: explicitly disable TFO in transports

diff --git a/test/confs/0015 b/test/confs/0015
index c6fccd3162a19c829bfa14893264c55b8db388e7..dbbdfd059943ecfc444acc5e18a4243b1a6199fa 100644 (file)
--- a/test/confs/0015
+++ b/test/confs/0015
@@ -100,6 +100,7 @@ delivery_s:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
 
 address_reply:
   allow_localhost
 
 address_reply:

diff --git a/test/confs/0032 b/test/confs/0032
index 961cefadd8758c3fa58602629480a13734d577ea..caf5edb289fa5488efd52e95588a54393335c3c6 100644 (file)
--- a/test/confs/0032
+++ b/test/confs/0032
@@ -38,6 +38,7 @@ local_delivery:
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/0033 b/test/confs/0033
index ca06da772d831cabea2daa4d6c6fae855f7868fe..c6bf4d32e79ea58c4a108e15a2319490de234df0 100644 (file)
--- a/test/confs/0033
+++ b/test/confs/0033
@@ -38,5 +38,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/0036 b/test/confs/0036
index 48479c7876dbb2666ceddfda9fe8971c4ec0c953..ded64879f49ae71a5a1db1ec815fa2727216fcc3 100644 (file)
--- a/test/confs/0036
+++ b/test/confs/0036
@@ -43,5 +43,6 @@ local_delivery:
 send_to_server:
   driver = smtp
   port = PORT_D
 send_to_server:
   driver = smtp
   port = PORT_D

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/0039 b/test/confs/0039
index 8ca8b1eeca3f851a244025a045f64e3f7cb0721d..f718997e9bfe4b2468bcc7d3b9b68cc3045c7afd 100644 (file)
--- a/test/confs/0039
+++ b/test/confs/0039
@@ -37,5 +37,6 @@ begin transports
 t1:
   driver = smtp
   hosts = V4NET.0.0.0
 t1:
   driver = smtp
   hosts = V4NET.0.0.0

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/0045 b/test/confs/0045
index a59c8e2c11ff2a80d45b1b3584ceb2ef4b7ae752..2a9efb565771b1032a9ef5ccd635f399ed445c8f 100644 (file)
--- a/test/confs/0045
+++ b/test/confs/0045
@@ -21,6 +21,7 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/0047 b/test/confs/0047
index 187f855ef8c2008a77a5b428c495fcdce3495bca..f9d77bdc2e9a034d2e2f2435fc1fc4c10825786a 100644 (file)
--- a/test/confs/0047
+++ b/test/confs/0047
@@ -25,5 +25,6 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/0054 b/test/confs/0054
index 3ad8751572a12c02b753ab0c7abd4d5e8efa6cce..1af7c0d512cf8a7b2f8167a77f767880796f85c7 100644 (file)
--- a/test/confs/0054
+++ b/test/confs/0054
@@ -25,6 +25,7 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/0055 b/test/confs/0055
index 72a2be7402b7ddf9ceb2c0c3a81f7fd855146275..6cc9b7c18e47f78c55d73697ae62ddb22e0ba5e1 100644 (file)
--- a/test/confs/0055
+++ b/test/confs/0055
@@ -52,6 +52,7 @@ local_delivery:
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0078 b/test/confs/0078
index aa1e445f358963735644ac26a4dee310c6dd5584..fe325bc397bc83ca816cb0306a697df32b20aa80 100644 (file)
--- a/test/confs/0078
+++ b/test/confs/0078
@@ -44,6 +44,7 @@ begin transports
 
 remote_smtp:
   driver = smtp
 
 remote_smtp:
   driver = smtp

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/0089 b/test/confs/0089
index b8bd142dbebc1fee02a36a590209cc3e3c14631e..4a2a65828a01de0a0cc9ec6f3b3cccb18ce77fc1 100644 (file)
--- a/test/confs/0089
+++ b/test/confs/0089
@@ -68,6 +68,7 @@ begin transports
 
 dummy:
   driver = smtp
 
 dummy:
   driver = smtp

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/0098 b/test/confs/0098
index 719971c9cf377002c2fa5ed3006201e0327b2671..cce115f12ed386d9b517c47e2abee5602ecfc4c0 100644 (file)
--- a/test/confs/0098
+++ b/test/confs/0098
@@ -92,10 +92,12 @@ smtp:
   driver = smtp
   connect_timeout = 1s
   port = PORT_D
   driver = smtp
   connect_timeout = 1s
   port = PORT_D

+  hosts_try_fastopen = :

 
 smtp_connect_refused:
   driver = smtp
   port = PORT_N
 
 smtp_connect_refused:
   driver = smtp
   port = PORT_N

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0099 b/test/confs/0099
index 63a918a0f5fd846f604c921db17941849d0d54e3..6a59d5994dc6653b988a1c88d96d01e8b39a89bb 100644 (file)
--- a/test/confs/0099
+++ b/test/confs/0099
@@ -41,6 +41,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_N
 smtp:
   driver = smtp
   port = PORT_N

+  hosts_try_fastopen = :

   RETRY
 
 
   RETRY
 
 

diff --git a/test/confs/0100 b/test/confs/0100
index c404d5a73f663c2bd5db8b7b36735ba89f2cd97a..143ff4cfe2e95ef2016381f51beca462237ef137 100644 (file)
--- a/test/confs/0100
+++ b/test/confs/0100
@@ -72,10 +72,12 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

 
 filtered_smtp:
   driver = smtp
   port = PORT_S
 
 filtered_smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

   transport_filter = /bin/sh -c "echo 'X-Filtered: just checking'; cat"
 
 local_delivery:
   transport_filter = /bin/sh -c "echo 'X-Filtered: just checking'; cat"
 
 local_delivery:

diff --git a/test/confs/0101 b/test/confs/0101
index 377eae705246c33d505d1b080ebff7821f2cad1b..cf89fa83aa5f31d28bef33f11440b0abe7b6d25f 100644 (file)
--- a/test/confs/0101
+++ b/test/confs/0101
@@ -50,6 +50,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

 
 local_delivery:
   driver = pipe
 
 local_delivery:
   driver = pipe

diff --git a/test/confs/0106 b/test/confs/0106
index ef91e8b106deeb52ef7ebea72e1990369fb3ab2d..84294a676474d560f9b92387ce53d883c1d17bc8 100644 (file)
--- a/test/confs/0106
+++ b/test/confs/0106
@@ -29,6 +29,7 @@ smtp:
   command_timeout = 1s
   final_timeout = 1s
   port = PORT_S
   command_timeout = 1s
   final_timeout = 1s
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0108 b/test/confs/0108
index a4ee442e2428c872cc9ebf5f31065310b4706d49..bc694ff3e8a209704bea38fb8b5039a08081f5ab 100644 (file)
--- a/test/confs/0108
+++ b/test/confs/0108
@@ -32,6 +32,7 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/0109 b/test/confs/0109
index 59957b96b319a3d230230e92d67ff7cd12758176..ce49c0e08d7101b06695369e146165164b0db09f 100644 (file)
--- a/test/confs/0109
+++ b/test/confs/0109
@@ -28,6 +28,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_N
 smtp:
   driver = smtp
   port = PORT_N

+  hosts_try_fastopen = :

   allow_localhost
 
 
   allow_localhost
 
 

diff --git a/test/confs/0130 b/test/confs/0130
index 02a095358d849d0bb211c7856244467657254483..fbfd2ec786be2f31802ab62e2e958523cda299a8 100644 (file)
--- a/test/confs/0130
+++ b/test/confs/0130
@@ -43,6 +43,7 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0135 b/test/confs/0135
index 6362944613905f7f455688148192255c37f14cfb..7fd5bdaa5647f841bd424f99ef92484a39adfdc1 100644 (file)
--- a/test/confs/0135
+++ b/test/confs/0135
@@ -44,6 +44,7 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

   connect_timeout = 1s
 
 local_delivery:
   connect_timeout = 1s
 
 local_delivery:

diff --git a/test/confs/0143 b/test/confs/0143
index 5a6ee34a956a2a1cc351fcc25c3c9993167400b7..8f0300aa09451bbcbd601348dbe61790ccb2e240 100644 (file)
--- a/test/confs/0143
+++ b/test/confs/0143
@@ -31,6 +31,7 @@ my_smtp:
   driver = smtp
   interface = HOSTIPV4
   port = PORT_S
   driver = smtp
   interface = HOSTIPV4
   port = PORT_S

+  hosts_try_fastopen = :

   debug_print = transport_name <$transport_name>
 
 
   debug_print = transport_name <$transport_name>
 
 

diff --git a/test/confs/0144 b/test/confs/0144
index 34b38230f88919c2398092da98f17bb8ffff386e..0b950b8543dfbd2ea3111a50b273bb15c563065f 100644 (file)
--- a/test/confs/0144
+++ b/test/confs/0144
@@ -28,6 +28,7 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0145 b/test/confs/0145
index 16b02a8582bb6301978f92ad626fe6f804feb6da..c7d8c8612b0178eea12307e852b4cdf8982d52c4 100644 (file)
--- a/test/confs/0145
+++ b/test/confs/0145
@@ -35,6 +35,7 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0146 b/test/confs/0146
index d8b6067e765e81fbd42ce304d739e8b4ee2e931d..8039ebdfa2b61203223feb5f87592a2a6b8b0e46 100644 (file)
--- a/test/confs/0146
+++ b/test/confs/0146
@@ -27,6 +27,7 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/0147 b/test/confs/0147
index 996d064be0848515b550179db5ee6a0731e06216..fae99a94a255865544ecfaad0fa65336497c9c87 100644 (file)
--- a/test/confs/0147
+++ b/test/confs/0147
@@ -60,6 +60,7 @@ begin transports
 
 T1:
   driver = smtp
 
 T1:
   driver = smtp

+  hosts_try_fastopen = :

 
 
 #----- ACL -----
 
 
 #----- ACL -----

diff --git a/test/confs/0160 b/test/confs/0160
index f6488372916fa5875f3906d627f206cd91a06943..ea2003a9283b00ac5a5669158ce46d6646448f22 100644 (file)
--- a/test/confs/0160
+++ b/test/confs/0160
@@ -31,6 +31,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0161 b/test/confs/0161
index 8b91ea053435adede9429458c08925b841669fcc..88845f325e4fca81f1b15931a4d71c9252fe07bb 100644 (file)
--- a/test/confs/0161
+++ b/test/confs/0161
@@ -62,6 +62,7 @@ begin transports
 
 remote_smtp:
   driver = smtp
 
 remote_smtp:
   driver = smtp

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/0163 b/test/confs/0163
index 7b19d9f16b43c523a50241bf6b45c9d1d78258c0..806c4b9e21c878fb7c4b4fa61b72013bc6b45663 100644 (file)
--- a/test/confs/0163
+++ b/test/confs/0163
@@ -28,6 +28,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0175 b/test/confs/0175
index b20e4fe1a2d67532bd9382d2b85f2862b09f13b0..461c265ba2ed8e0661361dd1d73f6c5b0a29b17b 100644 (file)
--- a/test/confs/0175
+++ b/test/confs/0175
@@ -58,6 +58,7 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

 
 appendfile:
   driver = appendfile
 
 appendfile:
   driver = appendfile

diff --git a/test/confs/0177 b/test/confs/0177
index 7921a8b55d4e8600975c19fe14900a9e6df8a5f3..0b78d4e0c41a5eb425057a490efec2cf1cfe3199 100644 (file)
--- a/test/confs/0177
+++ b/test/confs/0177
@@ -75,6 +75,7 @@ autoreply:
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0179 b/test/confs/0179
index 381b41cafbc474c911630f29bacb9397d465fd2e..f18ab32e56d9eae7ae2b50749112596a8dba349b 100644 (file)
--- a/test/confs/0179
+++ b/test/confs/0179
@@ -30,6 +30,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0183 b/test/confs/0183
index 8cd4c82d4549406a4edbf3764a5d688eafb0a24e..d55e5799f575a94911d502f344a2ce8b4ecdb88b 100644 (file)
--- a/test/confs/0183
+++ b/test/confs/0183
@@ -57,6 +57,7 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/0185 b/test/confs/0185
index d6e9fe0203e87f92edf1394608abd77319db9b7f..d9d20fc936cad620de174382b58e2e451a53f99f 100644 (file)
--- a/test/confs/0185
+++ b/test/confs/0185
@@ -72,6 +72,7 @@ autoreply:
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0186 b/test/confs/0186
index 21b31060cc746960417692f75f8b30e884e3c22a..5dffb3dd70248057301a9afc7304fb45b3981687 100644 (file)
--- a/test/confs/0186
+++ b/test/confs/0186
@@ -34,6 +34,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/0187 b/test/confs/0187
index bca41b5f71fe515cbcdd014cd0a26b4ea9f1425d..e2cd27ed5a2e79c3e80358ae1c84f7300bbe964a 100644 (file)
--- a/test/confs/0187
+++ b/test/confs/0187
@@ -45,6 +45,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0190 b/test/confs/0190
index 03ded9ce22be8fefff17b555540432580b38d212..cdddae5f828920cbaec6e1ba39ebaeaa6e0e5dea 100644 (file)
--- a/test/confs/0190
+++ b/test/confs/0190
@@ -85,10 +85,12 @@ smtp:
   max_rcpt = 1
   connection_max_messages = 1
   port = PORT_S
   max_rcpt = 1
   connection_max_messages = 1
   port = PORT_S

+  hosts_try_fastopen = :

 
 smtp2:
   driver = smtp
   port = PORT_S
 
 smtp2:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

 
 smtp3:
   driver = smtp
 
 smtp3:
   driver = smtp


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

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0191 b/test/confs/0191
index 9dba8c35d02b7b4762245272b5a0789c5827fc37..13d98bff92ce19bd69d121d657ff28dde051432e 100644 (file)
--- a/test/confs/0191
+++ b/test/confs/0191
@@ -28,6 +28,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 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"
   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 b3f25c4c063cde52aba1c623713372b594e9f2e0..c2e4a10e8e654995eb83aa23a83f4aa11bc4b400 100644 (file)
--- a/test/confs/0197
+++ b/test/confs/0197
@@ -95,6 +95,7 @@ makecopy:
 
 pass_on:
   driver = smtp
 
 pass_on:
   driver = smtp

+  hosts_try_fastopen = :

   connect_timeout = 1s
 
 
   connect_timeout = 1s
 
 

diff --git a/test/confs/0198 b/test/confs/0198
index f754a31878b1d7af08e157c9c422b79b1b0898f0..5de770163c79cff6a81ec0434a3fc291e82f8c6c 100644 (file)
--- a/test/confs/0198
+++ b/test/confs/0198
@@ -55,6 +55,7 @@ begin transports
 
 pass_on:
   driver = smtp
 
 pass_on:
   driver = smtp

+  hosts_try_fastopen = :

   connect_timeout = 1s
   gethostbyname
   hosts = NEXTHOST
   connect_timeout = 1s
   gethostbyname
   hosts = NEXTHOST

diff --git a/test/confs/0200 b/test/confs/0200
index ab50f36dfbf1280fa1c35732cd7399669ee9bfb7..03e6288289c34f5733288400ee72f7693b457cbf 100644 (file)
--- a/test/confs/0200
+++ b/test/confs/0200
@@ -35,6 +35,7 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/0201 b/test/confs/0201
index 5385baa9a0f206c4506ffb60cde9435434ab27b8..b4ad0d8d817687a00459ffa2d49012d44a54ea8e 100644 (file)
--- a/test/confs/0201
+++ b/test/confs/0201
@@ -26,6 +26,7 @@ t1:
   hosts = 127.0.0.1
   allow_localhost
   port = PORT_S
   hosts = 127.0.0.1
   allow_localhost
   port = PORT_S

+  hosts_try_fastopen = :

   transport_filter = /bin/sh -c 'cat; exit 99'
 
 
   transport_filter = /bin/sh -c 'cat; exit 99'
 
 

diff --git a/test/confs/0203 b/test/confs/0203
index 38e879010a0ca11bbea708b88a77313d8a23c187..1c197e720703f9f21c7582680b34404181a4d959 100644 (file)
--- a/test/confs/0203
+++ b/test/confs/0203
@@ -29,6 +29,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0208 b/test/confs/0208
index 5a0b9f1532218064f76517183b6c3568a6c68c5f..f1e9fea5daf128ab243c86f74577390f78556385 100644 (file)
--- a/test/confs/0208
+++ b/test/confs/0208
@@ -59,6 +59,7 @@ fail:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0209 b/test/confs/0209
index 82046c7bc025e93c13bb53701d06c092b3559446..b9d23b0581260e57fc5fc7eeedf0d725f54086fa 100644 (file)
--- a/test/confs/0209
+++ b/test/confs/0209
@@ -39,6 +39,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0210 b/test/confs/0210
index b1db52218267d9eca028803a25f6e705e37256ff..298ad7279db156862abda1ecf329fb1da6ea0cf6 100644 (file)
--- a/test/confs/0210
+++ b/test/confs/0210
@@ -62,6 +62,7 @@ bsmtp_smtp:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0211 b/test/confs/0211
index 7856481dffece63df6957d865c0fb976de09aebb..b1dae707c0600af35e4722a36649f6e5d343fc1f 100644 (file)
--- a/test/confs/0211
+++ b/test/confs/0211
@@ -52,6 +52,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

   command_timeout = 1s
 
 local_delivery:
   command_timeout = 1s
 
 local_delivery:

diff --git a/test/confs/0213 b/test/confs/0213
index ba0b9e403bc41724b437a0e0640a0c755dc3fe23..388f693ccf0766ccb9c9496213c6f49d792442d0 100644 (file)
--- a/test/confs/0213
+++ b/test/confs/0213
@@ -29,6 +29,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0215 b/test/confs/0215
index ad40d6338f62898633e3ca652ed5854bfe7986cc..2758b07c9e2eec7513e6b99e4caa26193c22edf2 100644 (file)
--- a/test/confs/0215
+++ b/test/confs/0215
@@ -40,6 +40,7 @@ lmtp:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   protocol = LMTP
   lmtp_ignore_quota = IGNORE_QUOTA
   AUTHS
   protocol = LMTP
   lmtp_ignore_quota = IGNORE_QUOTA
   AUTHS

diff --git a/test/confs/0216 b/test/confs/0216
index 69af54347e70f4eb03122e42138b07b3ef1d5126..962a64c28978f0bf6afce1e6ca4e4166053558fb 100644 (file)
--- 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
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D

+  hosts_try_fastopen = :

   max_rcpt = 0
   HAP
 
   max_rcpt = 0
   HAP
 

diff --git a/test/confs/0217 b/test/confs/0217
index fa797265af67d739fe5820675405f2419f235564..a225df5fefa815fa9fc9f7aa6d826b64d980067f 100644 (file)
--- 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
   command_timeout = 1s
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   HAP
   max_rcpt = 1000
 
   HAP
   max_rcpt = 1000
 

diff --git a/test/confs/0218 b/test/confs/0218
index fa97f9c67dbb525d9d17f97994c4dfa0be21e6dc..250bc92e6618bbacdfd70e90c9bfe8dfd2cebb93 100644 (file)
--- 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
   command_timeout = 1s
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   debug_print = T: $transport_name  (${acl {expand_check}})
 
 
   debug_print = T: $transport_name  (${acl {expand_check}})
 
 

diff --git a/test/confs/0225 b/test/confs/0225
index 3139eea5b446274b7a79e68dd3d2781bf5fb83b4..0ed97b4efda83791bcc8e1c007a10a7aea4d320b 100644 (file)
--- a/test/confs/0225
+++ b/test/confs/0225
@@ -40,6 +40,7 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

diff --git a/test/confs/0227 b/test/confs/0227
index fea66e16f8d7b950f9a91350e970bd4ff582353a..36050fa7dbad3a82a97a99bc0fb75fff90cf1138 100644 (file)
--- a/test/confs/0227
+++ b/test/confs/0227
@@ -81,6 +81,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

 
 lmtp:
   driver = smtp
 
 lmtp:
   driver = smtp

diff --git a/test/confs/0228 b/test/confs/0228
index 19f6cb7cd6f37c74699f584310d7f604f06afd85..d8fb762afd2e67d2f32cb3e0ceaff4960f897f28 100644 (file)
--- a/test/confs/0228
+++ b/test/confs/0228
@@ -31,6 +31,7 @@ smtp:
   driver = smtp
   fallback_hosts = HOSTIPV4
   port = PORT_S
   driver = smtp
   fallback_hosts = HOSTIPV4
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0229 b/test/confs/0229
index 5389f97bce57d93e4e02275e5b873e53ae628613..c8c048dbc5bdc80ee4a216b1b9e1abea57b77cc9 100644 (file)
--- 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
           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 -----
 
 
 # ----- Retry -----

diff --git a/test/confs/0230 b/test/confs/0230
index c26b45758a608a14b67718e5099262dcf1371de0..f77f52f69d90166988516bc064ddd3672abe6b8d 100644 (file)
--- a/test/confs/0230
+++ b/test/confs/0230
@@ -64,6 +64,7 @@ local_delivery:
 remote:
   driver = smtp
   port = PORT_D
 remote:
   driver = smtp
   port = PORT_D

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0231 b/test/confs/0231
index d0adf39077fb32ccd8573cba0ac4fa00dea95f10..1eabae91a2885c32388e37a4fc25f8516df72398 100644 (file)
--- 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
   headers_rewrite = *@domain1 $1-rewrite@domain2 f :\
                     *@domain1 $1-other@domain2
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0238 b/test/confs/0238
index 15aa2205297e9209f41d90891198c6812925b42d..4d92cdde7e019d184d16eb1a06e4d8a5eefd5e30 100644 (file)
--- a/test/confs/0238
+++ b/test/confs/0238
@@ -33,6 +33,7 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0239 b/test/confs/0239
index f4b1a68baad883c2727b8ee5db2cc21dd7186d50..e7e26517a7f1e2d3d24c9c080579220406b3a8cc 100644 (file)
--- a/test/confs/0239
+++ b/test/confs/0239
@@ -39,6 +39,7 @@ local:
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0242 b/test/confs/0242
index fc2dd70ba406afcfe153a654eb90b0af5a1039cc..63265a6dcc3ce84fa03a914530301c5e135c7883 100644 (file)
--- a/test/confs/0242
+++ b/test/confs/0242
@@ -30,6 +30,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0253 b/test/confs/0253
index cd2c777deea0c102a1550085d8703af74842b303..40ede04ea4e3c858b4d5e4ab55ee1d1c7fdb96cd 100644 (file)
--- a/test/confs/0253
+++ b/test/confs/0253
@@ -64,6 +64,7 @@ t3:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   max_rcpt = 1
   allow_localhost
   return_path = pqr=$local_part+$domain@verp.domain
   max_rcpt = 1
   allow_localhost
   return_path = pqr=$local_part+$domain@verp.domain

diff --git a/test/confs/0257 b/test/confs/0257
index f61689380304a966dea7c534459ef1f5c2fe78f2..056b54f045f8037a1415437302b41bfc2843772e 100644 (file)
--- 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
   connect_timeout = 1s
   fallback_hosts = ten-2.test.ex
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0259 b/test/confs/0259
index 6b9bc29ab88f4b51b8d9b1ab090e6b2998aae339..f6ae742d45c480132c57864806c457fa9dce2285 100644 (file)
--- a/test/confs/0259
+++ b/test/confs/0259
@@ -26,6 +26,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

 
 
 begin retry
 
 
 begin retry

diff --git a/test/confs/0261 b/test/confs/0261
index 30ec087fdd17a279fbe834809c1bcba17c67a113..7b2b7a1a69dab19e2d9e3269ea156939291d6d72 100644 (file)
--- a/test/confs/0261
+++ b/test/confs/0261
@@ -16,10 +16,12 @@ begin transports
 remote_delivery:
   driver = smtp
   hosts = V4NET.0.0.1
 remote_delivery:
   driver = smtp
   hosts = V4NET.0.0.1

+  hosts_try_fastopen = :

 
 bad_return:
   driver = smtp
   hosts = V4NET.0.0.0
 
 bad_return:
   driver = smtp
   hosts = V4NET.0.0.0

+  hosts_try_fastopen = :

   return_path = ${if
 
 no_hosts:
   return_path = ${if
 
 no_hosts:

diff --git a/test/confs/0263 b/test/confs/0263
index 53b0064e7858603cb6250134322d0460dc37c4cd..f215cdb3260ea46e8ffc757525c071cc096e4170 100644 (file)
--- a/test/confs/0263
+++ b/test/confs/0263
@@ -14,6 +14,7 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0273 b/test/confs/0273
index 0a12a6762af2ce35486698c7c8a706230740abad..4acc0a935df9d1f5b7ab19060b7bc31aa45c3c80 100644 (file)
--- a/test/confs/0273
+++ b/test/confs/0273
@@ -16,6 +16,7 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0276 b/test/confs/0276
index 257cf45933231f6fae7c0bb5eff35c2b72b7f0a8..94e7a130f1832b154c1b3996903221c67030ad0b 100644 (file)
--- a/test/confs/0276
+++ b/test/confs/0276
@@ -16,6 +16,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
 
 # ----- Routers -----
   allow_localhost
 
 # ----- Routers -----

diff --git a/test/confs/0285 b/test/confs/0285
index f0871a56508d58fdc7b92eb1e472f0e4b0955283..8b0ada1f1ae5d7a338758a15ab65cfec161b040e 100644 (file)
--- a/test/confs/0285
+++ b/test/confs/0285
@@ -33,6 +33,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

   max_rcpt = 2
   connection_max_messages = 3
 
   max_rcpt = 2
   connection_max_messages = 3
 

diff --git a/test/confs/0286 b/test/confs/0286
index 8ec70bfbbf1e9bc0cb6b4acd73401c208e772baa..c6f5daab3ebea0dace3d6ce7705aa29c2cefb5ef 100644 (file)
--- a/test/confs/0286
+++ b/test/confs/0286
@@ -34,6 +34,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

   max_rcpt = 2
   connection_max_messages = 3
 
   max_rcpt = 2
   connection_max_messages = 3
 

diff --git a/test/confs/0288 b/test/confs/0288
index 12c308baf1fc7389ab5b094c2dc4cb05d03497a8..ac7369b635286d4b6272c4c75a0e7b096349e478 100644 (file)
--- a/test/confs/0288
+++ b/test/confs/0288
@@ -30,6 +30,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

   max_rcpt = 1
   connection_max_messages = 1
   serialize_hosts = 127.0.0.1
   max_rcpt = 1
   connection_max_messages = 1
   serialize_hosts = 127.0.0.1

diff --git a/test/confs/0292 b/test/confs/0292
index 6e70a792519a3bf64974698ccfebe69223ec487a..d3ea4f342f78efa06d9148b3da4b840beacfae0e 100644 (file)
--- a/test/confs/0292
+++ b/test/confs/0292
@@ -38,6 +38,7 @@ t1:
 
 t2:
   driver = smtp
 
 t2:
   driver = smtp

+  hosts_try_fastopen = :

   debug_print = \$host=$host \$host_address=$host_address
 
 # End
   debug_print = \$host=$host \$host_address=$host_address
 
 # End

diff --git a/test/confs/0299 b/test/confs/0299
index 5d648b85d34fdfc43778738846f346d291906f7a..d7dc87314665476f436bda79d689c1bdd480b3c5 100644 (file)
--- a/test/confs/0299
+++ b/test/confs/0299
@@ -38,6 +38,7 @@ t2:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   max_rcpt = 2
 
   allow_localhost
   max_rcpt = 2
 

diff --git a/test/confs/0315 b/test/confs/0315
index fed3ceca19edabb5c9e9f0eb5ac344e209a00b52..ae86fdc2a6e7189fb0eb1185f258efcf31e2a8f0 100644 (file)
--- a/test/confs/0315
+++ b/test/confs/0315
@@ -28,5 +28,6 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/0322 b/test/confs/0322
index 396b0c65365fc52678c30f92c0f42d52d6a1f819..f78739673dd9ad7276a02c154ad3c8c15336785e 100644 (file)
--- a/test/confs/0322
+++ b/test/confs/0322
@@ -29,6 +29,7 @@ smtp:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/0332 b/test/confs/0332
index 4fe3b3fd4d307145d4553f5a33f01c200c539578..a309e8e6211fe77497ce0cd2c20a63afadaa57d8 100644 (file)
--- a/test/confs/0332
+++ b/test/confs/0332
@@ -34,6 +34,7 @@ t1:
   hosts = 127.0.0.1
   hosts_override
   port = PORT_S
   hosts = 127.0.0.1
   hosts_override
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0333 b/test/confs/0333
index 4192292857e723203bad01691c536c507c764f57..c14c07165a23a0f75da9b1810fc78bd425234577 100644 (file)
--- a/test/confs/0333
+++ b/test/confs/0333
@@ -33,6 +33,7 @@ t1:
   hosts = 127.0.0.1
   hosts_override
   port = PORT_S
   hosts = 127.0.0.1
   hosts_override
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0334 b/test/confs/0334
index 553763b0a77cfee7bcbbaaf7afdee96628514d91..dc4e8a07b972a5d917c39e8a4fd6116c623f7963 100644 (file)
--- a/test/confs/0334
+++ b/test/confs/0334
@@ -25,6 +25,7 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0341 b/test/confs/0341
index 726793390a9386db182016863241cbd9422d98b6..dcc4dec3a2a2140d592313e256e116dcbbea86f3 100644 (file)
--- 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
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/0342 b/test/confs/0342
index dba9020f4814897d414285edbeb3be7bbbe7f24e..b6bc47eda3a0ef6e33de386723a5137a9e400a20 100644 (file)
--- a/test/confs/0342
+++ b/test/confs/0342
@@ -35,6 +35,7 @@ begin transports
 
 remote_smtp:
   driver = smtp
 
 remote_smtp:
   driver = smtp

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0343 b/test/confs/0343
index c613da449829dd3b2d3b49edb451f1184a2eae35..a5741eade053f3f4e8959e7b96d5e7631a46f55e 100644 (file)
--- 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 = 127.0.0.1
   allow_localhost
   port = PORT_N

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0344 b/test/confs/0344
index 0b29b0629e036dd78b1b4f21452d91e6bb9ec285..794e85eb3c3f6a83de06a01285887e952e71e598 100644 (file)
--- a/test/confs/0344
+++ b/test/confs/0344
@@ -32,15 +32,19 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

 
 t2:
   driver = smtp
 
 t2:
   driver = smtp

+  hosts_try_fastopen = :

 
 t3:
   driver = smtp
 
 t3:
   driver = smtp

+  hosts_try_fastopen = :

 
 t4:
   driver = smtp
 
 t4:
   driver = smtp

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0350 b/test/confs/0350
index 09bd635dbd5c3fd9edacaf557b48a2f15e5bdcc0..927bdb7f76660948ae841c75f503b725165c9745 100644 (file)
--- a/test/confs/0350
+++ b/test/confs/0350
@@ -25,5 +25,6 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/0357 b/test/confs/0357
index 3f11016f532316527c7b244d68b911b0c1ee90f9..f6f2102350d815439f827b9655eb50986596cebe 100644 (file)
--- a/test/confs/0357
+++ b/test/confs/0357
@@ -26,6 +26,7 @@ t1:
   hosts = 127.0.0.1
   allow_localhost
   port = PORT_S
   hosts = 127.0.0.1
   allow_localhost
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0358 b/test/confs/0358
index 311687026e0fcef5cb295add5c77026985e5d876..e451c84b5dbf5531d5ad1eddf6a44398333a0029 100644 (file)
--- a/test/confs/0358
+++ b/test/confs/0358
@@ -26,6 +26,7 @@ t1:
   hosts = 127.0.0.1
   allow_localhost
   port = PORT_S
   hosts = 127.0.0.1
   allow_localhost
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0360 b/test/confs/0360
index d226449a8c76e800338751db712308222014f93b..f2f87c26f9329431190437cacb86d8ffb9353317 100644 (file)
--- a/test/confs/0360
+++ b/test/confs/0360
@@ -36,6 +36,7 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0361 b/test/confs/0361
index f9007ec0cc5cbf23bb1689c39a5382374aecdf50..909d7f39727103ba20b20acee39a57cd893c6a2f 100644 (file)
--- a/test/confs/0361
+++ b/test/confs/0361
@@ -39,6 +39,7 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

 
 t2:
   driver = appendfile
 
 t2:
   driver = appendfile

diff --git a/test/confs/0362 b/test/confs/0362
index 6588f609ffcd9b49fa041d8c095e49f45f97f898..cdfe7d532864f5f6ba96c0c38181b646f1ecfe06 100644 (file)
--- a/test/confs/0362
+++ b/test/confs/0362
@@ -48,6 +48,7 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

 
 t2:
   driver = appendfile
 
 t2:
   driver = appendfile

diff --git a/test/confs/0363 b/test/confs/0363
index c4304087662a27c4042f250b062bc526f2fb2464..872024893c49110e8d41f6d2591d8b21ab0c3e09 100644 (file)
--- a/test/confs/0363
+++ b/test/confs/0363
@@ -26,6 +26,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
 
 
   allow_localhost
 
 

diff --git a/test/confs/0364 b/test/confs/0364
index e15bc91274d90ac05b5519532dcd7e60d03172bc..0ae251b366dc86be6a856a7e74dbd18fdc467419 100644 (file)
--- a/test/confs/0364
+++ b/test/confs/0364
@@ -49,6 +49,7 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

 
 t2:
   driver = appendfile
 
 t2:
   driver = appendfile

diff --git a/test/confs/0365 b/test/confs/0365
index 0bd6cc161796df59dac7c5dfb11b97142de87560..c5d8a0b5326b637e29bc2d23ff49d179458bd9e7 100644 (file)
--- a/test/confs/0365
+++ b/test/confs/0365
@@ -81,5 +81,6 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/0366 b/test/confs/0366
index 97d2e62a17495788edead17c82ed5477d6e1b01f..12e47cd5b502f3ae60ab9e7fc80628c4354f1b1e 100644 (file)
--- 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
   connect_timeout = 1s
   hosts_max_try = HOSTS_MAX_TRY
   port = PORT_N

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0367 b/test/confs/0367
index 2d69a07abb7beb921a47957df8d65250d101ca92..911c3dd1cf60d524bbe50bb4fa614592a50f213c 100644 (file)
--- a/test/confs/0367
+++ b/test/confs/0367
@@ -28,6 +28,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0368 b/test/confs/0368
index fee202781788543a056d13e78b548e74ab4617cc..41756dff9d52ae588017dad91536a34e9c48c5dd 100644 (file)
--- a/test/confs/0368
+++ b/test/confs/0368
@@ -30,6 +30,7 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0374 b/test/confs/0374
index 652a5062b40e99434dfb81fa5152d40053b4ced0..2843442762548928ae052fa25169c4675933f2ca 100644 (file)
--- a/test/confs/0374
+++ b/test/confs/0374
@@ -75,6 +75,7 @@ ut3:
 ut4:
   driver = smtp
   hosts = 127.0.0.1
 ut4:
   driver = smtp
   hosts = 127.0.0.1

+  hosts_try_fastopen = :

   port = PORT_S
   allow_localhost
   max_rcpt = 1
   port = PORT_S
   allow_localhost
   max_rcpt = 1

diff --git a/test/confs/0375 b/test/confs/0375
index 06b16f3836fcb86d177832e1ffb985cee03c2757..164f32788143204df5603d95ccfd8ef19e4aabbc 100644 (file)
--- a/test/confs/0375
+++ b/test/confs/0375
@@ -114,6 +114,7 @@ ut4:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   max_rcpt = 1
   disable_logging
   allow_localhost
   max_rcpt = 1
   disable_logging


@@ -124,6 +125,7 @@ ut5:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   max_rcpt = 1
   disable_logging
   allow_localhost
   max_rcpt = 1
   disable_logging


@@ -135,6 +137,7 @@ ut6:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   max_rcpt = 1
   disable_logging
   allow_localhost
   max_rcpt = 1
   disable_logging

diff --git a/test/confs/0376 b/test/confs/0376
index e3a158f7e2062fe7fffceb92181ec6b32bfe9bc1..7679a649f9ebc2b650d058c35af66d8db5dfc4d6 100644 (file)
--- a/test/confs/0376
+++ b/test/confs/0376
@@ -70,6 +70,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0388 b/test/confs/0388
index 9a7be305d62883809ed0041dd519f3852144c774..03a8bd853a849fa3042b43d5e2e570fe0492bb52 100644 (file)
--- a/test/confs/0388
+++ b/test/confs/0388
@@ -31,6 +31,7 @@ smtp:
   driver = smtp
   hosts_max_try = 1
   port = PORT_S
   driver = smtp
   hosts_max_try = 1
   port = PORT_S

+  hosts_try_fastopen = :

   connect_timeout = 2s
   address_retry_include_sender = false
 
   connect_timeout = 2s
   address_retry_include_sender = false
 

diff --git a/test/confs/0392 b/test/confs/0392
index e76c867727ad55f1a7dc56cb423492f8fb079789..95feb39bdf30ccd0dd089f7a26a20952bd43af51 100644 (file)
--- a/test/confs/0392
+++ b/test/confs/0392
@@ -28,9 +28,11 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

 
 t2:
   driver = smtp
 
 t2:
   driver = smtp

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/0398 b/test/confs/0398
index 9fbe1b8da36dcc527941c155792dcfd17796835e..e71a01c2d8706cd2fc44e7f86c5b9e49b0b0fe2e 100644 (file)
--- a/test/confs/0398
+++ b/test/confs/0398
@@ -60,6 +60,7 @@ t1:
 t2:
   driver = smtp
   port = PORT_S
 t2:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
 
 
   allow_localhost
 
 

diff --git a/test/confs/0405 b/test/confs/0405
index edf720c4842501fb89612fbabdd406ebf39fe305..7d8a3cea9aa53b90a6f1e7f356eb72a41e451532 100644 (file)
--- a/test/confs/0405
+++ b/test/confs/0405
@@ -29,6 +29,7 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/0413 b/test/confs/0413
index 118dbcfe977938649310ca057e1195aee715db06..44b0da01fb8cb92df420f89af435776b367ed6c8 100644 (file)
--- a/test/confs/0413
+++ b/test/confs/0413
@@ -51,6 +51,7 @@ t1:
   hosts = 127.0.0.1
   allow_localhost
   port = PORT_S
   hosts = 127.0.0.1
   allow_localhost
   port = PORT_S

+  hosts_try_fastopen = :

 
 t2:
   driver = smtp
 
 t2:
   driver = smtp


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

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/0417 b/test/confs/0417
index 41c5ed975c88386e896368b4ccbe9b76503248bd..2f3ed5df46786b6e4e598a59eb492c224561472d 100644 (file)
--- a/test/confs/0417
+++ b/test/confs/0417
@@ -37,5 +37,6 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/0419 b/test/confs/0419
index 39f634c632d8d358c1ef181ddd9ba47512aa6879..a006214303fa20493344f4c902a8a092db8d4975 100644 (file)
--- a/test/confs/0419
+++ b/test/confs/0419
@@ -27,6 +27,7 @@ begin transports
 
 smtp:
  driver = smtp
 
 smtp:
  driver = smtp

+ hosts_try_fastopen =  :

 
 
 # End
 
 
 # End

diff --git a/test/confs/0425 b/test/confs/0425
index 6c9383a41db9631e6614919385bc80fd7032b198..1ade850724c1c1226787e8d13df5cdfcd81596fb 100644 (file)
--- a/test/confs/0425
+++ b/test/confs/0425
@@ -38,6 +38,7 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/0426 b/test/confs/0426
index fbac9ecfd203ab9ab9bf71f31b6d7ab814fa90ed..c5b773fae2f5b3e4a28e0c3d91bea8c176e68f56 100644 (file)
--- a/test/confs/0426
+++ b/test/confs/0426
@@ -29,6 +29,7 @@ begin transports
 t1:
   driver = smtp
   port = PORT_S
 t1:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/0429 b/test/confs/0429
index 49df930014020595b5a2c45385ce5a89c66f5be3..c70a9386ba2a7d9066ca0b3834f4e9e5dd482635 100644 (file)
--- a/test/confs/0429
+++ b/test/confs/0429
@@ -24,6 +24,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   hosts_avoid_esmtp = 127.0.0.1
 
   allow_localhost
   hosts_avoid_esmtp = 127.0.0.1
 

diff --git a/test/confs/0430 b/test/confs/0430
index 552b0d010320b1e6e6f90064361b1ed9525b66fe..cca101c48c4a738f5e32e64fb85f214503a94038 100644 (file)
--- a/test/confs/0430
+++ b/test/confs/0430
@@ -37,5 +37,6 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/0431 b/test/confs/0431
index 7590fa9d47c8a2019776174ffd7813347d5bd661..4af033ca9a1e873463737380daff2f2dbf30a8ae 100644 (file)
--- a/test/confs/0431
+++ b/test/confs/0431
@@ -42,6 +42,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   AFFIX
 
   allow_localhost
   AFFIX
 

diff --git a/test/confs/0432 b/test/confs/0432
index e8e6e3552cee2b0d5f40fd9ac0a0e991e9fc59d6..aab1de468852adb94e14f92779ae88013bdc7727 100644 (file)
--- a/test/confs/0432
+++ b/test/confs/0432
@@ -37,6 +37,7 @@ t1:
   driver = smtp
   hosts = <; 127.0.0.1 ;
   port = PORT_S
   driver = smtp
   hosts = <; 127.0.0.1 ;
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
 
 # End
   allow_localhost
 
 # End

diff --git a/test/confs/0434 b/test/confs/0434
index 0d77fa095651a98f9bf42ae63fb754abde111b22..7b6ec65ad01eb0ebd116a3d406ebf2ef0139af65 100644 (file)
--- a/test/confs/0434
+++ b/test/confs/0434
@@ -27,6 +27,7 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

 
 
 
 
 
 

diff --git a/test/confs/0440 b/test/confs/0440
index 2bef8c96158eb1dd6c336160299c4e8a1af53e5f..fe2cef9970612d9c9f0b7a409e415a776361de04 100644 (file)
--- a/test/confs/0440
+++ b/test/confs/0440
@@ -28,6 +28,7 @@ begin transports
 t1:
   driver = smtp
   port = PORT_S
 t1:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

   transport_filter = /bin/cat
 
 
   transport_filter = /bin/cat
 
 

diff --git a/test/confs/0447 b/test/confs/0447
index 57b992d1b6174b2c5babd84089012198b7b2cd9d..86618fbd31afd19d092c00db56c6865399a2dccb 100644 (file)
--- a/test/confs/0447
+++ b/test/confs/0447
@@ -36,6 +36,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   connect_timeout = 999999s
 
   allow_localhost
   connect_timeout = 999999s
 

diff --git a/test/confs/0450 b/test/confs/0450
index 2dff861a11545d696f4c55c48a7b54bee5d1301f..7324af64f164b17e0ffecf2e2b6543c1f5414d42 100644 (file)
--- a/test/confs/0450
+++ b/test/confs/0450
@@ -28,6 +28,7 @@ begin transports
 t1:
   driver = smtp
   hosts = 127.0.0.1
 t1:
   driver = smtp
   hosts = 127.0.0.1

+  hosts_try_fastopen = :

   allow_localhost
   port = ${if queue_running{PORT_D2}{PORT_D}}EXTRA
 
   allow_localhost
   port = ${if queue_running{PORT_D2}{PORT_D}}EXTRA
 

diff --git a/test/confs/0455 b/test/confs/0455
index 390c28a9592c9a718be76e88035917d7e5d7619c..becac26f7afa872a36c28ca0842e619cf8b49876 100644 (file)
--- a/test/confs/0455
+++ b/test/confs/0455
@@ -39,6 +39,7 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

   connect_timeout = 1s
   hosts_max_try = HOSTS_MAX_TRY
 
   connect_timeout = 1s
   hosts_max_try = HOSTS_MAX_TRY
 

diff --git a/test/confs/0461 b/test/confs/0461
index 30abd50a9d3a5cd8dc4528c11fb33a47f2a6d33e..4aca116e5dcf8d6929c139b4d336767e3907d765 100644 (file)
--- a/test/confs/0461
+++ b/test/confs/0461
@@ -37,6 +37,7 @@ begin transports
 t1:
   driver = smtp
   port = PORT_S
 t1:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

   connect_timeout = 1s
   allow_localhost
 
   connect_timeout = 1s
   allow_localhost
 

diff --git a/test/confs/0462 b/test/confs/0462
index 36d18412d0fa357c0d8893756ce301ac830f91c9..951420f11f0ab6d2ac8fe5dc805ee38a0c89e8a2 100644 (file)
--- a/test/confs/0462
+++ b/test/confs/0462
@@ -44,6 +44,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0463 b/test/confs/0463
index 8be1d95c14756f4b862b8bd256f629848948d09b..686e180e39bbf8832f86d74fe0a1e8674d3b9d9e 100644 (file)
--- a/test/confs/0463
+++ b/test/confs/0463
@@ -27,5 +27,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/0464 b/test/confs/0464
index 21e41cb08f93c6dd0e43857b0cc1bd2528cfa2a1..eb538e7ed540e2ed39da522e6a43a278da87c0a4 100644 (file)
--- a/test/confs/0464
+++ b/test/confs/0464
@@ -46,5 +46,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/0466 b/test/confs/0466
index 880a41e33bb4b97f2a879bf7807ec37eb2ed531c..58057269eedfbf79000dd1d4e187936a979c08aa 100644 (file)
--- a/test/confs/0466
+++ b/test/confs/0466
@@ -50,5 +50,6 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/0467 b/test/confs/0467
index 147aca64e009485060e5167e1bbab4ef06635744..0104face20a0dbdea19c808fedffa1b444d5b28f 100644 (file)
--- a/test/confs/0467
+++ b/test/confs/0467
@@ -27,5 +27,6 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/0469 b/test/confs/0469
index a008dde0002916bbc2fa00af5212857c22dc6091..378254b5cb0708d65c16e2fc9f44e5b2df917290 100644 (file)
--- a/test/confs/0469
+++ b/test/confs/0469
@@ -25,5 +25,6 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/0473 b/test/confs/0473
index 6dd6b8898148a1f274d0e246ddabd0bc40b0d08e..8e7985302988ed890b094e1851c601bcddb702fe 100644 (file)
--- a/test/confs/0473
+++ b/test/confs/0473
@@ -42,5 +42,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/0474 b/test/confs/0474
index 35b4805e553a4c56b0e5161f55bd2e96320c3181..bc07dc66c6cb878cd528e92148a8aef27bbe2406 100644 (file)
--- a/test/confs/0474
+++ b/test/confs/0474
@@ -24,6 +24,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0476 b/test/confs/0476
index fd6106b162390b4181be5decad6a431f7eedb980..1db78e796da92bdbc85cfb335a62cc559c5bf938 100644 (file)
--- a/test/confs/0476
+++ b/test/confs/0476
@@ -26,6 +26,7 @@ begin transports
 t1:
   driver = smtp
   port = PORT_S
 t1:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0477 b/test/confs/0477
index 04d8365916c8019598c5de9c009b28591fc7d808..6dc192ecc060af34a33aa9ef3aca627005082d82 100644 (file)
--- a/test/confs/0477
+++ b/test/confs/0477
@@ -27,6 +27,7 @@ t1:
   driver = smtp
   port = PORT_S
   interface = 99.99.99.99
   driver = smtp
   port = PORT_S
   interface = 99.99.99.99

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0478 b/test/confs/0478
index cfb9a17b1af20023eb263121231fc0f5eb642c75..786f6c547ed661169ab72d57c24fc1ff9518d50a 100644 (file)
--- a/test/confs/0478
+++ b/test/confs/0478
@@ -27,6 +27,7 @@ begin transports
 t1:
   driver = smtp
   port = PORT_D
 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}}}}}}
   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 bfb9b86134ad1e2772151b7b60529777b73434e0..d8ea0465b32337f7ee579a9d88860033a94a8112 100644 (file)
--- a/test/confs/0479
+++ b/test/confs/0479
@@ -35,6 +35,7 @@ t1:
   driver = smtp
   port = PORT_S
   hosts = 127.0.0.1
   driver = smtp
   port = PORT_S
   hosts = 127.0.0.1

+  hosts_try_fastopen = :

   allow_localhost
   connect_timeout = 1s
 
   allow_localhost
   connect_timeout = 1s
 

diff --git a/test/confs/0492 b/test/confs/0492
index a939fe12572d1d21251800b8dae3f61a29edbae1..855ea31deed9d9ff6db5ca7bcc74f3b85d5ba0a9 100644 (file)
--- a/test/confs/0492
+++ b/test/confs/0492
@@ -32,6 +32,7 @@ begin transports
 t1:
   driver = smtp
   hosts = 127.0.0.1
 t1:
   driver = smtp
   hosts = 127.0.0.1

+  hosts_try_fastopen = :

   allow_localhost
 
 t2:
   allow_localhost
 
 t2:

diff --git a/test/confs/0495 b/test/confs/0495
index 5bfec709fce870b38175255250d505967d2ac69c..dc1a394b0a4c3f82d031fab9a98676a03ca214a2 100644 (file)
--- a/test/confs/0495
+++ b/test/confs/0495
@@ -64,6 +64,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   command_timeout = 1s
 
   allow_localhost
   command_timeout = 1s
 


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

+  hosts_try_fastopen = :

 
 t3:
   driver = appendfile
 
 t3:
   driver = appendfile


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

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/0497 b/test/confs/0497
index 2154c3c2cb2f49f34b07f4de93cb44e123fab1d5..c1c866e279d68643749bff4800a3666515cfa8f8 100644 (file)
--- a/test/confs/0497
+++ b/test/confs/0497
@@ -30,6 +30,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
 
 
   allow_localhost
 
 

diff --git a/test/confs/0498 b/test/confs/0498
index c26f43a8a0fdeedd25dff5456f6fe2ce183d5841..8b84a4d05998c8db1caa46319e0f519134d82888 100644 (file)
--- a/test/confs/0498
+++ b/test/confs/0498
@@ -30,6 +30,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   final_timeout = 1s
 
   allow_localhost
   final_timeout = 1s
 

diff --git a/test/confs/0499 b/test/confs/0499
index b7a0b7980ed8e303bfacb91f998afb8667b1b564..32975f45fc4f430a7556512e11d54c669f960fab 100644 (file)
--- a/test/confs/0499
+++ b/test/confs/0499
@@ -27,6 +27,7 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/0504 b/test/confs/0504
index c7b0131c06f8a6aa4fc465ccf78dcd95dd27aa83..981ed16c344dd25d2bd20f24b34c8301d7193769 100644 (file)
--- a/test/confs/0504
+++ b/test/confs/0504
@@ -35,6 +35,7 @@ t3:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   transport_filter = /non/existent/file
 
   allow_localhost
   transport_filter = /non/existent/file
 

diff --git a/test/confs/0511 b/test/confs/0511
index 1ecc19998e35c70aac4c890d0a7b9cf14926ca3b..230971cd58c5b007509a5f311daf09b5d9358cd3 100644 (file)
--- a/test/confs/0511
+++ b/test/confs/0511
@@ -24,6 +24,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
 
 # End
   allow_localhost
 
 # End

diff --git a/test/confs/0512 b/test/confs/0512
index 15e424a5139ede6cc8fc44d4fa0b6203b8072ee2..7f31b97652a27e6e1d502fcff305541ac8a4f859 100644 (file)
--- 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
   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
   allow_localhost
   hosts_max_try = 1
   HARDLIMIT

diff --git a/test/confs/0518 b/test/confs/0518
index c413faa953c948926f6e3ab4e598ff07527a00dd..1e6dd2277605c56f7ca3694af5ce3d854d0a84a6 100644 (file)
--- a/test/confs/0518
+++ b/test/confs/0518
@@ -40,6 +40,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   rcpt_include_affixes
 
   allow_localhost
   rcpt_include_affixes
 


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

+  hosts_try_fastopen = :

   allow_localhost
 
 # End
   allow_localhost
 
 # End

diff --git a/test/confs/0519 b/test/confs/0519
index e6dbb009039f7783dbb61c5accf181701092530c..98d55a2b34c9137832214308a66d9e737919a854 100644 (file)
--- 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
   driver = smtp
   hosts = 127.0.0.1 : non-exist.test.ex
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
 
 # End
   allow_localhost
 
 # End

diff --git a/test/confs/0525 b/test/confs/0525
index a6e429172bc08c5bd6e70de21e6650a5c49f24c9..f4c35adc5d6cea375fa478b5403e2933504f4b7e 100644 (file)
--- a/test/confs/0525
+++ b/test/confs/0525
@@ -32,6 +32,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   data_timeout = 1s
 
   allow_localhost
   data_timeout = 1s
 

diff --git a/test/confs/0528 b/test/confs/0528
index e7313a5cace030cec684cc8cf5a3049b2d85c0af..1e9bafa270ad145fa42c40debfbc1d618bd4c7ae 100644 (file)
--- a/test/confs/0528
+++ b/test/confs/0528
@@ -32,6 +32,7 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

   hosts_max_try = 20
   allow_localhost
 
   hosts_max_try = 20
   allow_localhost
 

diff --git a/test/confs/0531 b/test/confs/0531
index 2f72810cf2f0411ca9c5a91df23280a674b73593..0af86b968f5929120fc89889710a741fbc4a2492 100644 (file)
--- a/test/confs/0531
+++ b/test/confs/0531
@@ -39,6 +39,7 @@ lmtp:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   protocol = LMTP
 
 
   protocol = LMTP
 
 

diff --git a/test/confs/0538 b/test/confs/0538
index 9081aa572950fd9a3ab79e32aff77144484b6bdb..d6342bf4acab264483af477f9581513d38b3ae2f 100644 (file)
--- a/test/confs/0538
+++ b/test/confs/0538
@@ -40,6 +40,7 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/0540 b/test/confs/0540
index 7ebbdd2b4340437f4c246c09ba5951764883f3be..05329af89a071ae38a76911f812dab34f9e8e6f4 100644 (file)
--- a/test/confs/0540
+++ b/test/confs/0540
@@ -36,6 +36,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   helo_data = ${if eq{$domain}{yes1}{localhost}{aname}}
 
   allow_localhost
   helo_data = ${if eq{$domain}{yes1}{localhost}{aname}}
 

diff --git a/test/confs/0543 b/test/confs/0543
index 88e74e58fed80391ece4ae9d0c54d6ff8d0ac053..108119c6ebdef7da093f9eb46f1f27c3cd4315ff 100644 (file)
--- a/test/confs/0543
+++ b/test/confs/0543
@@ -28,6 +28,7 @@ smtp:
   hosts_max_try = 1
   allow_localhost
   port = PORT_S
   hosts_max_try = 1
   allow_localhost
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0544 b/test/confs/0544
index 09949a3fafe8b96070732601856b2cfbb245e323..bccfad9dbb5bad1cc5237ad041f9dad30b024d19 100644 (file)
--- a/test/confs/0544
+++ b/test/confs/0544
@@ -52,6 +52,7 @@ smtp:
   hosts = 127.0.0.1
   allow_localhost
   port = PORT_S
   hosts = 127.0.0.1
   allow_localhost
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0545 b/test/confs/0545
index a78236a4a5b6bcdd2eaa08e33f7c9d8c5cf8dc92..a78361bc4ac1f55d261a144e394ada8e5fa1b26c 100644 (file)
--- a/test/confs/0545
+++ b/test/confs/0545
@@ -23,6 +23,7 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/0548 b/test/confs/0548
index a450f45c34954c73bd5c690982952410aca80449..112952e9abab40067deb21239b851e574740ab36 100644 (file)
--- a/test/confs/0548
+++ b/test/confs/0548
@@ -44,6 +44,7 @@ smtp:
   hosts = HOSTIPV4 : thishost.test.ex
   allow_localhost
   port = PORT_D
   hosts = HOSTIPV4 : thishost.test.ex
   allow_localhost
   port = PORT_D

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0550 b/test/confs/0550
index caf3ceda7cab34c00a5c0cb70214f20de0494453..16699b3ac568ca8e94174991e3a59a9e17d822f3 100644 (file)
--- a/test/confs/0550
+++ b/test/confs/0550
@@ -24,6 +24,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   helo_data = \
     ${if eq{$sending_ip_address}{127.0.0.1}{Tweedledum}{Tweedledee}} \
   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 c4c2f5e98ed156fb133fc63baf2f46e2b509cbce..153185561f8cf64803472aba8af1ca652c00b969 100644 (file)
--- a/test/confs/0552
+++ b/test/confs/0552
@@ -46,6 +46,7 @@ begin transports
 t1:
   driver = smtp
   port = PORT_D
 t1:
   driver = smtp
   port = PORT_D

+  hosts_try_fastopen = :

   hosts = 127.0.0.1
   allow_localhost
   command_timeout = 2s
   hosts = 127.0.0.1
   allow_localhost
   command_timeout = 2s

diff --git a/test/confs/0553 b/test/confs/0553
index c9ceaa59e5ac3f06902e2a0ba2fcedefbd244ef9..92fcc0a6fcb50841b9fa55b39286386707ae8596 100644 (file)
--- a/test/confs/0553
+++ b/test/confs/0553
@@ -45,6 +45,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_D
 smtp:
   driver = smtp
   port = PORT_D

+  hosts_try_fastopen = :

   command_timeout = 2s
 
 
   command_timeout = 2s
 
 

diff --git a/test/confs/0554 b/test/confs/0554
index c4f240c391e5a72d9384f682639c8b1081c9e6d1..e519d076dc78fc270f55385a3545d81186e69ad2 100644 (file)
--- a/test/confs/0554
+++ b/test/confs/0554
@@ -25,6 +25,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0557 b/test/confs/0557
index 9b7dec2e6e64249cadd0afe3b2fa74cc5fda5315..41a614f104b634df8ef1bbb3374b1dc67b7c94c5 100644 (file)
--- a/test/confs/0557
+++ b/test/confs/0557
@@ -36,6 +36,7 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

 
 t2:
   driver = appendfile
 
 t2:
   driver = appendfile

diff --git a/test/confs/0561 b/test/confs/0561
index 5ccf4dcc32e22f823a61c2e36d9fc16cf0c33e96..7095eb2e63b9ff62dc2ee6a56895c84d72faeeda 100644 (file)
--- a/test/confs/0561
+++ b/test/confs/0561
@@ -33,5 +33,6 @@ begin transports
 t1:
   driver = smtp
   port = PORT_D
 t1:
   driver = smtp
   port = PORT_D

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/0565 b/test/confs/0565
index 0d053a08049099f6ec7aaf0d88d8bbb5e88d968b..f7accd8d0dcb87b14c0d236ff0c2dbff902955eb 100644 (file)
--- a/test/confs/0565
+++ b/test/confs/0565
@@ -34,11 +34,13 @@ begin transports
 remote_smtp:
   driver = smtp
   port = PORT_S
 remote_smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
 
 remote_smtp_hdrs:
   driver = smtp
   port = PORT_S
   allow_localhost
 
 remote_smtp_hdrs:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   headers_only
 
   allow_localhost
   headers_only
 

diff --git a/test/confs/0570 b/test/confs/0570
index 962e76bb055f24d66bac8c9a51715d7819c64886..efaf3bccbd0c3ad26040981628032d2815680556 100644 (file)
--- a/test/confs/0570
+++ b/test/confs/0570
@@ -35,6 +35,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_D
 smtp:
   driver = smtp
   port = PORT_D

+  hosts_try_fastopen = :

   OPTION
   max_parallel = 1
 
   OPTION
   max_parallel = 1
 

diff --git a/test/confs/0572 b/test/confs/0572
index 23da35a096f5391cf0fd6bd30005b145f7fde603..ce621bb31053e4ed7203a9d2c99f110cfd838292 100644 (file)
--- a/test/confs/0572
+++ b/test/confs/0572
@@ -35,6 +35,7 @@ my_smtp:
   driver = smtp
   interface = HOSTIPV4
   port = PORT_S
   driver = smtp
   interface = HOSTIPV4
   port = PORT_S

+  hosts_try_fastopen = :

   debug_print = transport_name <$transport_name>
 
 
   debug_print = transport_name <$transport_name>
 
 

diff --git a/test/confs/0580 b/test/confs/0580
index 54ef7ae70d41da4486406b0c73f067cb511ec861..6dbc06d64242e5e48765e17c35e69dd79110d48c 100644 (file)
--- a/test/confs/0580
+++ b/test/confs/0580
@@ -37,6 +37,7 @@ begin transports
 t1:
   driver = smtp
   port =   PORT_S
 t1:
   driver = smtp
   port =   PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0603 b/test/confs/0603
index baa3ea08c665d2c7ff4f22479950769c26472646..eaf6a6b908a4f4552253c0cb64ca673be7a36b28 100644 (file)
--- 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
   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}}
 
   # 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 ec5195511ee34c56ae0bd2290070da7a4e5e6ab2..46fc8cf9c20c7c81b49e163fffd5f902aeeab39b 100644 (file)
--- 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
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0607 b/test/confs/0607
index 03c05231699621cf675149d8b0a2f539fce74cca..c074ce4e85ce5e5416e7d5c0a330103b59c51098 100644 (file)
--- a/test/confs/0607
+++ b/test/confs/0607
@@ -31,6 +31,7 @@ begin transports
 out:
   driver = smtp
   port = PORT_D
 out:
   driver = smtp
   port = PORT_D

+  hosts_try_fastopen = :

 
 # End
 
 
 # End
 

diff --git a/test/confs/0610 b/test/confs/0610
index 49778352f87ababc5bbb625d9208f19f9a89d213..5ce2723aeee6f2f083533362c63b3d76217b3e28 100644 (file)
--- 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 = 127.0.0.1
   port = PORT_D
   interface = 127.0.0.1

+  hosts_try_fastopen = :

 
 t2:
   driver = smtp
 
 t2:
   driver = smtp


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

+  hosts_try_fastopen = :

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

diff --git a/test/confs/0611 b/test/confs/0611
index d3e0a47b21bd4c8c28deb7f00cda3ae553259a37..84be24f05800cbb094e610694d696ef4d61b1e95 100644 (file)
--- a/test/confs/0611
+++ b/test/confs/0611
@@ -55,6 +55,7 @@ begin transports
 smtp:
   driver =     smtp
   port =       PORT_D
 smtp:
   driver =     smtp
   port =       PORT_D

+  hosts_try_fastopen = :

   max_rcpt =   1
   connection_max_messages = 1
   max_parallel = 2
   max_rcpt =   1
   connection_max_messages = 1
   max_parallel = 2

diff --git a/test/confs/0613 b/test/confs/0613
index 5094759ebf23e07f994ad3bf672a8f033ff08bd3..617c6566302bf1afdbcf9d6d4a5cc14dda6784a6 100644 (file)
--- a/test/confs/0613
+++ b/test/confs/0613
@@ -27,5 +27,6 @@ begin transports
 
 remote_smtp:
   driver = smtp
 
 remote_smtp:
   driver = smtp

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/0616 b/test/confs/0616
index e710a4bc5a35fbbd6743790a502c6d1cf6b0db61..6fb08b3951bb91a95aec0702b22a3465355d83ed 100644 (file)
--- a/test/confs/0616
+++ b/test/confs/0616
@@ -36,5 +36,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/0617 b/test/confs/0617
index cf52517747f375089123a970376c947cc1a60a80..625c7e372eb17efd70b0d912102fcbfc1407cc78 100644 (file)
--- a/test/confs/0617
+++ b/test/confs/0617
@@ -36,5 +36,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/0618 b/test/confs/0618
index db4bd300295537205b43f072d5b5554e4afc9fad..7359e16336d239e7053d5b74e6b8eed1f9e05fff 100644 (file)
--- a/test/confs/0618
+++ b/test/confs/0618
@@ -75,6 +75,7 @@ begin transports
 smtp:
   driver =     smtp
   event_action = ${acl {ev_log}}
 smtp:
   driver =     smtp
   event_action = ${acl {ev_log}}

+  hosts_try_fastopen = :

 
 bad_tpt:
   driver =     smtp
 
 bad_tpt:
   driver =     smtp

diff --git a/test/confs/0900 b/test/confs/0900
index ce6f2c3795b2670aef5508272592d6c30122c930..4c824c4b41ecabf68a6614a4a777fa69afe6f1e5 100644 (file)
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -106,6 +106,7 @@ remote_smtp:
   driver = smtp
   hosts =      127.0.0.1
   port =       PORT_S
   driver = smtp
   hosts =      127.0.0.1
   port =       PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
   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
   driver = smtp
   hosts =      127.0.0.1
   port =       PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s

diff --git a/test/confs/0901 b/test/confs/0901
index 67b73cd19e38df9650a5aa8180161a3561b24957..2e299c7dd9108a6dfadaaee7872813e10ab62eb9 100644 (file)
--- a/test/confs/0901
+++ b/test/confs/0901
@@ -97,6 +97,7 @@ remote_smtp:
   driver = smtp
   hosts =      127.0.0.1
   port =       PORT_S
   driver = smtp
   hosts =      127.0.0.1
   port =       PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
   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
   driver = smtp
   hosts =      127.0.0.1
   port =       PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s

diff --git a/test/confs/0906 b/test/confs/0906
index 6df517e53eafc10e8a3cc49d6cb76a211cba5781..c320b256938c5c0426e02024002980b3022e87d6 100644 (file)
--- a/test/confs/0906
+++ b/test/confs/0906
@@ -85,12 +85,14 @@ remote_smtp:
   driver = smtp
   hosts =      127.0.0.1
   port =       PORT_D
   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
   allow_localhost
 
 remote_smtp_dkim:
   driver = smtp
   hosts =      127.0.0.1
   port =       PORT_D

+  hosts_try_fastopen = :

   allow_localhost
 
 .ifdef OPT
   allow_localhost
 
 .ifdef OPT

diff --git a/test/confs/1003 b/test/confs/1003
index d15a892fbe82eb440c24dbaf2731ad749ae32e4b..df1e4889146929ef946b9644d760be75075ff8c4 100644 (file)
--- 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
   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:
   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
   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:
   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
   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:
   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
   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:
   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
   allow_localhost
   hosts = ${if eq {$local_part}{user4} {127.0.0.1} {<; ::1}}
   port = PORT_D

+  hosts_try_fastopen = :

   interface = <; ${if 
 
 send_to_server:
   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
   allow_localhost
   hosts = ${if eq {$local_part}{user4} {127.0.0.1} {<; ::1}}
   port = PORT_D

+  hosts_try_fastopen = :

   interface = ${expand:$h_interface:}
 
 
   interface = ${expand:$h_interface:}
 
 

diff --git a/test/confs/1005 b/test/confs/1005
index 35767932d67c59f169dd7cd5424c55cf7098c35b..1b01dc468f60d37edccbbbd01cb72f5cd6be9490 100644 (file)
--- a/test/confs/1005
+++ b/test/confs/1005
@@ -25,6 +25,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/1006 b/test/confs/1006
index f46fba9323d2e1a260af8d5e93a0efdb6b52e35a..5f5dfd5f391743649c37ba7d9f60e688f55c2c3d 100644 (file)
--- a/test/confs/1006
+++ b/test/confs/1006
@@ -37,6 +37,7 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/1008 b/test/confs/1008
index e3307044fc022b83591066c145f7ca15de397a46..44c7153ffbccede8c553e70fa9abe8be7a540fe2 100644 (file)
--- a/test/confs/1008
+++ b/test/confs/1008
@@ -26,6 +26,7 @@ begin transports
 t1:
   driver = smtp
   port = PORT_S
 t1:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/1009 b/test/confs/1009
index fbfa7f0c108bd49f896daccd48f08ccd15a0f56a..c8184a64e246967802a355ca7fa0528c5359a3ad 100644 (file)
--- a/test/confs/1009
+++ b/test/confs/1009
@@ -38,6 +38,7 @@ begin transports
 t1:
   driver = smtp
   port = PORT_S
 t1:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/2000 b/test/confs/2000
index 9ca325f2a27e49cc5093245e09cfff8883109a4c..11104b09da346d44a68b89f43d9937d81814f96a 100644 (file)
--- 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
   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
   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 715da4bf6163d2181c2f0ac13c07cdd9d7a9f248..d6525cae5e42f3d7535d4aaa96f47efccb26b06e 100644 (file)
--- a/test/confs/2001
+++ b/test/confs/2001
@@ -49,6 +49,7 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1

+  hosts_try_fastopen = :

   OPTION
   port = PORT_D
   tls_certificate = DIR/aux-fixed/cert2
   OPTION
   port = PORT_D
   tls_certificate = DIR/aux-fixed/cert2

diff --git a/test/confs/2007 b/test/confs/2007
index a16b9a57ef5faf79b4a03e2fb9d934083809eb40..d666f6ac2d2c3c745259519fdfacf42a6e7054a1 100644 (file)
--- 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
   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
 
 send_to_server2:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/2008 b/test/confs/2008
index 83b30502af8611e3f776ba90f012b8eec87c7a68..1f12493c552d3ecec05640f7cafca4e9aad9eb63 100644 (file)
--- 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
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D

+  hosts_try_fastopen = :

   helo_data = helo.data.changed
 
 send_to_server2:
   helo_data = helo.data.changed
 
 send_to_server2:


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

+  hosts_try_fastopen = :

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

diff --git a/test/confs/2009 b/test/confs/2009
index 59139f27e05dbdd4dd8cd8beacb8ac7a7fddd23d..21f9f26737ab45c61e8b9b90e61c341b5a918870 100644 (file)
--- a/test/confs/2009
+++ b/test/confs/2009
@@ -54,7 +54,8 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1

-  hosts_avoid_tls = 127.0.0.1

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_avoid_tls = 127.0.0.1

 
 # End
 
 # End

diff --git a/test/confs/2010 b/test/confs/2010
index 2cedb89cf9779df9558645dbd0e04a99f8501d32..dae45a08c88f21ca33042ac4a75cf113ed40c764 100644 (file)
--- a/test/confs/2010
+++ b/test/confs/2010
@@ -44,8 +44,9 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = HOSTS
   driver = smtp
   allow_localhost
   hosts = HOSTS

-  hosts_require_tls = *

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_require_tls = *

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

diff --git a/test/confs/2012 b/test/confs/2012
index 8fbc555957e8b1af02566e54aec764d03975ec89..f59b91a0c897790076d7316ab6cfd6f221d47b46 100644 (file)
--- a/test/confs/2012
+++ b/test/confs/2012
@@ -93,8 +93,9 @@ send_to_server_failcert:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4

-  hosts_require_tls = HOSTIPV4

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


@@ -107,8 +108,9 @@ send_to_server_retry:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1

-  hosts_require_tls = HOSTIPV4

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


@@ -122,8 +124,9 @@ send_to_server_crypt:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4

-  hosts_require_tls = HOSTIPV4

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


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

+  hosts_try_fastopen = :

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


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

+  hosts_try_fastopen = :

    tls_certificate = CERT2
    tls_privatekey = CERT2
  
    tls_certificate = CERT2
    tls_privatekey = CERT2
  


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

+  hosts_try_fastopen = :

    tls_certificate = CERT2
    tls_privatekey = CERT2
  
    tls_certificate = CERT2
    tls_privatekey = CERT2
  

diff --git a/test/confs/2013 b/test/confs/2013
index 4c9fcd3e8ca221099529f7813afd79e75e44cc21..1a23887b361ee6ce3dc56b6f08996474191cdbe8 100644 (file)
--- a/test/confs/2013
+++ b/test/confs/2013
@@ -66,8 +66,9 @@ send_to_server:
   allow_localhost
   hosts_override
   hosts = 127.0.0.1
   allow_localhost
   hosts_override
   hosts = 127.0.0.1

-  hosts_noproxy_tls = PEX

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_noproxy_tls = PEX

   tls_try_verify_hosts = :
 
 # End
   tls_try_verify_hosts = :
 
 # End

diff --git a/test/confs/2016 b/test/confs/2016
index b14e1f30087da8d532d02fc5536bb933adbcfa11..ead3a903ba054ad0aed23a3ca80e2dbcb3e40832 100644 (file)
--- 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
   command_timeout = 1s
   hosts_require_tls = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/2017 b/test/confs/2017
index a699f2d7855ae8fef764f16c7c2178ae4774e5ac..98fdc07caba0d36362f93c090fcfa8dd36850014 100644 (file)
--- a/test/confs/2017
+++ b/test/confs/2017
@@ -53,8 +53,9 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1

-  hosts_nopass_tls = *

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_nopass_tls = *

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

diff --git a/test/confs/2021 b/test/confs/2021
index ccd201719c64c2a4b5285606ed4e6f29e1ae874f..a7e89f8da3cae49a6fe9f9c8d2c288367fcc6d57 100644 (file)
--- 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
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   REQUIRE
   TRYCLEAR
 
   REQUIRE
   TRYCLEAR
 

diff --git a/test/confs/2025 b/test/confs/2025
index fdf1e04057ad2e707267b6c2453e99ed6110f65f..8c08abebe05c3baa767613c42c375902c20dbf30 100644 (file)
--- 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
   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} }
   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 c678219db69d03973a716d19d62cd765df318f8d..270a0682c8a64ab0026fcacffeba645d5b6ce1a4 100644 (file)
--- a/test/confs/2026
+++ b/test/confs/2026
@@ -63,6 +63,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_D
   driver = smtp
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_D

+  hosts_try_fastopen = :

   allow_localhost
 
 t2:
   allow_localhost
 
 t2:

diff --git a/test/confs/2030 b/test/confs/2030
index e2ee0e223023f8f7ad047d3746b883f3b7318c8a..490b35f601a3a0cab5b146c02f1dd0bfbf0d3829 100644 (file)
--- a/test/confs/2030
+++ b/test/confs/2030
@@ -53,6 +53,7 @@ send_to_server1:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D

+  hosts_try_fastopen = :

   tls_sni = fred
 
 send_to_server2:
   tls_sni = fred
 
 send_to_server2:


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

+  hosts_try_fastopen = :

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

diff --git a/test/confs/2031 b/test/confs/2031
index 0d9bba6406116bfea32e9438974ac8ac554db2d9..af27b2ffd6840696f581b6c4389a17d4eaa47329 100644 (file)
--- a/test/confs/2031
+++ b/test/confs/2031
@@ -65,6 +65,7 @@ send_to_server1:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D

+  hosts_try_fastopen = :

   tls_sni = fred
 
 send_to_server2:
   tls_sni = fred
 
 send_to_server2:


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

+  hosts_try_fastopen = :

   tls_sni = bill
 
 
   tls_sni = bill
 
 

diff --git a/test/confs/2033 b/test/confs/2033
index 73dcde61e16f3ec67724a0d578474ac37ec032e9..15e632a57d301bdf2d40b0d52b3ec230bb70eeba 100644 (file)
--- a/test/confs/2033
+++ b/test/confs/2033
@@ -100,8 +100,9 @@ send_to_server_failcert:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4

-  hosts_require_tls = HOSTIPV4

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


@@ -112,8 +113,9 @@ send_to_server_retry:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1

-  hosts_require_tls = HOSTIPV4

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


@@ -125,8 +127,9 @@ send_to_server_crypt:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4

-  hosts_require_tls = HOSTIPV4

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


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

+  hosts_try_fastopen = :

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


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

+  hosts_try_fastopen = :

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


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

+  hosts_try_fastopen = :

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


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

+  hosts_try_fastopen = :

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 

diff --git a/test/confs/2100 b/test/confs/2100
index bce339b19c458b1c733447b7e38c5f64ef3ddb0b..827d93811e691a6df7c51debdf7e275cbc13c3d1 100644 (file)
--- 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
   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
   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 a0e1fe46f82cb4086d505b899f67f7d7b6875682..32c309677bf538d2240bbc34dfe9aeee1a97710b 100644 (file)
--- a/test/confs/2101
+++ b/test/confs/2101
@@ -46,6 +46,7 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1

+  hosts_try_fastopen = :

   OPTION
   port = PORT_D
   tls_certificate = DIR/aux-fixed/cert2
   OPTION
   port = PORT_D
   tls_certificate = DIR/aux-fixed/cert2

diff --git a/test/confs/2107 b/test/confs/2107
index 9487445ccae2652e6d2487f9bf60513f00262d3e..5cf1dc373414dd0a00107dee5968034ae3a070e9 100644 (file)
--- 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
   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
 
 send_to_server2:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/2108 b/test/confs/2108
index 9b926bf6e6c55ffa1b89df1f176662b3c6ef4a1d..5db771d13c861f87fab86801c9767e3013d56812 100644 (file)
--- 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
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D

+  hosts_try_fastopen = :

   helo_data = helo.data.changed
 
 send_to_server2:
   helo_data = helo.data.changed
 
 send_to_server2:


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

+  hosts_try_fastopen = :

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

diff --git a/test/confs/2109 b/test/confs/2109
index 8703d1967bfb0727af9963c09d0eec96d9736f8e..3f1465fa2217eea9663c73a600532f8d6c83404d 100644 (file)
--- a/test/confs/2109
+++ b/test/confs/2109
@@ -54,7 +54,8 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1

-  hosts_avoid_tls = 127.0.0.1

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_avoid_tls = 127.0.0.1

 
 # End
 
 # End

diff --git a/test/confs/2110 b/test/confs/2110
index 72754a6d9fccc62ea2fe3b80675a68c83ad3e38b..cc4a7f03279a76fe71ee98dba7b1840251eb06a4 100644 (file)
--- a/test/confs/2110
+++ b/test/confs/2110
@@ -43,8 +43,9 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = HOSTS
   driver = smtp
   allow_localhost
   hosts = HOSTS

-  hosts_require_tls = *

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_require_tls = *

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

diff --git a/test/confs/2111 b/test/confs/2111
index b54c9490d26e7d70df568bdd941c0a540f1601b9..42458efba103f684f59ccf3739eec22c6745fed9 100644 (file)
--- 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
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1

-  hosts_require_tls = HOSTIPV4

   port = PORT_D
   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:\
   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 005925e111b720776cf6d8eec5cced3b3e1720d1..2b3f33ed3845890dafa7b1e5ef3541e9e274acce 100644 (file)
--- a/test/confs/2112
+++ b/test/confs/2112
@@ -93,8 +93,9 @@ send_to_server_failcert:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4

-  hosts_require_tls = HOSTIPV4

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


@@ -107,8 +108,9 @@ send_to_server_retry:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1

-  hosts_require_tls = HOSTIPV4

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


@@ -122,8 +124,9 @@ send_to_server_crypt:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4

-  hosts_require_tls = HOSTIPV4

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


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

+  hosts_try_fastopen = :

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


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

+  hosts_try_fastopen = :

    tls_certificate = CERT2
    tls_privatekey = CERT2
  
    tls_certificate = CERT2
    tls_privatekey = CERT2
  


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

+  hosts_try_fastopen = :

    tls_certificate = CERT2
    tls_privatekey = CERT2
  
    tls_certificate = CERT2
    tls_privatekey = CERT2
  

diff --git a/test/confs/2113 b/test/confs/2113
index f48e618d39d5fa301b299f3105ea6460b73d3bca..eb9d2b487fb2f1b26676c96d33d815d8527031c3 100644 (file)
--- a/test/confs/2113
+++ b/test/confs/2113
@@ -66,8 +66,9 @@ send_to_server:
   allow_localhost
   hosts_override
   hosts = 127.0.0.1
   allow_localhost
   hosts_override
   hosts = 127.0.0.1

-  hosts_noproxy_tls = PEX

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_noproxy_tls = PEX

   tls_try_verify_hosts = :
 
 # End
   tls_try_verify_hosts = :
 
 # End

diff --git a/test/confs/2116 b/test/confs/2116
index d57d3a112d102c0059bf6afbbd6aad43e81899ba..77a6712612cdde8087ee5fedc821c51a37b58b15 100644 (file)
--- a/test/confs/2116
+++ b/test/confs/2116
@@ -27,8 +27,9 @@ begin transports
 smtp:
   driver = smtp
   command_timeout = 1s
 smtp:
   driver = smtp
   command_timeout = 1s

-  hosts_require_tls = 127.0.0.1

   port = PORT_S
   port = PORT_S

+  hosts_try_fastopen = :
+  hosts_require_tls = 127.0.0.1

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

diff --git a/test/confs/2117 b/test/confs/2117
index b6a5576675de2bd3663480b429e9aa2da2c98f69..cdec8306bdb256def5c335299ae446aba87b576a 100644 (file)
--- a/test/confs/2117
+++ b/test/confs/2117
@@ -53,9 +53,10 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1

-  hosts_nopass_tls = *

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :

   tls_try_verify_hosts = :
   tls_try_verify_hosts = :

+  hosts_nopass_tls = *

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

diff --git a/test/confs/2120 b/test/confs/2120
index 1288d7f128ece2246814dcfed568b2cc82324c8a..9469cb7386d6c119ca2e9cf1358e64477bdbc5cc 100644 (file)
--- a/test/confs/2120
+++ b/test/confs/2120
@@ -36,6 +36,7 @@ t1:
   hosts = thishost.test.ex
   allow_localhost
   port = PORT_D
   hosts = thishost.test.ex
   allow_localhost
   port = PORT_D

+  hosts_try_fastopen = :

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

diff --git a/test/confs/2121 b/test/confs/2121
index 573ea379a5d27b2abe283f79cd41a311ead78e66..6dcaa05777b7b3a356065dedd0c73131478c5637 100644 (file)
--- 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
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   REQUIRE
   TRYCLEAR
 
   REQUIRE
   TRYCLEAR
 

diff --git a/test/confs/2125 b/test/confs/2125
index 5898791337eaa4953d3e30cec1898b4be19fc75b..3591c86536e95c0c56901dbb26f34309abcc1a5b 100644 (file)
--- 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
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1

+  port = PORT_D

   hosts_require_tls = HOSTIPV4
   tls_require_ciphers = AES128-SHA
   hosts_require_tls = HOSTIPV4
   tls_require_ciphers = AES128-SHA

-  port = PORT_D
+  hosts_try_fastopen = :

   tls_try_verify_hosts = :
 
 
   tls_try_verify_hosts = :
 
 

diff --git a/test/confs/2126 b/test/confs/2126
index 9f0af7cf6e1d702f5ca7e9f0d351d2b8888c4550..cb448134feede6f64e00234e6baa867fce697641 100644 (file)
--- a/test/confs/2126
+++ b/test/confs/2126
@@ -51,6 +51,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_D
   driver = smtp
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_D

+  hosts_try_fastopen = :

   allow_localhost
   tls_try_verify_hosts = :
 
   allow_localhost
   tls_try_verify_hosts = :
 

diff --git a/test/confs/2127 b/test/confs/2127
index 9807ccf11dfa74de2dda0b75a23169946c819978..65e1901f6f39ebfc09156b11f20b99e5bfcaddd6 100644 (file)
--- 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
   allow_localhost
   hosts = ${if eq{$local_part}{userx}{127.0.0.1}{HOSTIPV4}}
   port = PORT_D

+  hosts_try_fastopen = :

   tls_try_verify_hosts = :
 
 # End
   tls_try_verify_hosts = :
 
 # End

diff --git a/test/confs/2130 b/test/confs/2130
index 379d2c98a724d2801a8d6068b08ba48d7406a538..4afded1cf2e7e1320ee95c94554494c59d0e184c 100644 (file)
--- a/test/confs/2130
+++ b/test/confs/2130
@@ -53,6 +53,7 @@ send_to_server1:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D

+  hosts_try_fastopen = :

   tls_sni = fred
   tls_try_verify_hosts = :
 
   tls_sni = fred
   tls_try_verify_hosts = :
 


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

+  hosts_try_fastopen = :

   tls_try_verify_hosts = :
 
 
   tls_try_verify_hosts = :
 
 

diff --git a/test/confs/2131 b/test/confs/2131
index 43db2ac1c228dc8456061e54a9f8b3ee854f9842..243fc092c0beb96b544a2b3d9ef2b1bd919eac15 100644 (file)
--- a/test/confs/2131
+++ b/test/confs/2131
@@ -65,6 +65,7 @@ send_to_server1:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D

+  hosts_try_fastopen = :

   tls_sni = fred
   hosts_require_tls = *
   tls_try_verify_hosts = :
   tls_sni = fred
   hosts_require_tls = *
   tls_try_verify_hosts = :


@@ -74,6 +75,7 @@ send_to_server2:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D

+  hosts_try_fastopen = :

   tls_sni = bill
   hosts_require_tls = *
   tls_try_verify_hosts = :
   tls_sni = bill
   hosts_require_tls = *
   tls_try_verify_hosts = :

diff --git a/test/confs/2133 b/test/confs/2133
index e58a0c65c6366e6e7cb648f74faccd5851a76fb6..463e614ca5c9725dbd119dc896e55319bd62a686 100644 (file)
--- a/test/confs/2133
+++ b/test/confs/2133
@@ -101,8 +101,9 @@ send_to_server_failcert:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4

-  hosts_require_tls = HOSTIPV4

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


@@ -113,8 +114,9 @@ send_to_server_retry:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1

-  hosts_require_tls = HOSTIPV4

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


@@ -126,8 +128,9 @@ send_to_server_crypt:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4

-  hosts_require_tls = HOSTIPV4

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


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

+  hosts_try_fastopen = :

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


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

+  hosts_try_fastopen = :

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


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

+  hosts_try_fastopen = :

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


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

+  hosts_try_fastopen = :

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 

diff --git a/test/confs/2135 b/test/confs/2135
index f7f2257462ef38fdf9fe7c97ee981fcfcef97384..4625f759d30a776e2b51880980b1c53683e3e81b 100644 (file)
--- a/test/confs/2135
+++ b/test/confs/2135
@@ -67,6 +67,7 @@ begin transports
 
 t1:
   driver =     smtp
 
 t1:
   driver =     smtp

+  hosts_try_fastopen = :

   tls_verify_certificates =    DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =  :
 
   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 7fec82541853f7a4f27d0422ce8f639603360a59..d5dba1b3fbea7ee7aca65ac25f835fd3a31a3d48 100644 (file)
--- a/test/confs/2138
+++ b/test/confs/2138
@@ -57,8 +57,9 @@ local_delivery:
 send_to_server:
   driver =     smtp
   allow_localhost
 send_to_server:
   driver =     smtp
   allow_localhost

-  hosts_noproxy_tls = :

   port =       PORT_D
   port =       PORT_D

+  hosts_try_fastopen = :
+  hosts_noproxy_tls = :

   tls_try_verify_hosts = :
   max_rcpt =   1
 
   tls_try_verify_hosts = :
   max_rcpt =   1
 

diff --git a/test/confs/2149 b/test/confs/2149
index 072e8e438c5716f57c7cff67c64123078f1b981b..ee48a51b334073bf36425bd47516f77784fb6757 100644 (file)
--- 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
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D

+  hosts_try_fastopen = :

   tls_try_verify_hosts = :
 
 # End
   tls_try_verify_hosts = :
 
 # End

diff --git a/test/confs/2151 b/test/confs/2151
index f64cdd50ee23c0f2beee82866d1644de4e3e7b85..1e40a83ae6b9839b753390a7a259672e51a03769 100644 (file)
--- a/test/confs/2151
+++ b/test/confs/2151
@@ -39,5 +39,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/2152 b/test/confs/2152
index f783192bdcf11874b78e74a5e248a9659d5f936a..a5acff04753867c6f9ae5b6d1d573b4834825c15 100644 (file)
--- 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
   allow_localhost
   hosts =      127.0.0.1
   port =       PORT_D

+  hosts_try_fastopen = :

   tls_verify_certificates = DIR/aux-fixed/cert1
   tls_verify_cert_hostnames = :
 
   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
   allow_localhost
   hosts =      127.0.0.1
   port =       PORT_D2

+  hosts_try_fastopen = :

   tls_verify_certificates = DIR/aux-fixed/cert1
   tls_verify_cert_hostnames = :
 
   tls_verify_certificates = DIR/aux-fixed/cert1
   tls_verify_cert_hostnames = :
 

diff --git a/test/confs/2201 b/test/confs/2201
index dce78ed7a435c711cc6a946a9198f15a16bcd1ed..4ce79253dbb857ec2518653eb05aac51c48eacdf 100644 (file)
--- 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 = 127.0.0.1
   allow_localhost
   port = PORT_D

+  hosts_try_fastopen = :

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

diff --git a/test/confs/3207 b/test/confs/3207
index 6880dcf90c14e8a72b61c89750c4be291eb60d5a..bf8d1d4c5c2f3252953cb3cf06d909edec165de5 100644 (file)
--- a/test/confs/3207
+++ b/test/confs/3207
@@ -82,6 +82,7 @@ local_delivery:
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

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

diff --git a/test/confs/3209 b/test/confs/3209
index d5a442ddb8c09e1f23bbb40b9edef42425621785..fff1f374f00aecdc5f732157157ea088499fbca3 100644 (file)
--- a/test/confs/3209
+++ b/test/confs/3209
@@ -28,6 +28,7 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

   connect_timeout = 1s
 
 
   connect_timeout = 1s
 
 

diff --git a/test/confs/3401 b/test/confs/3401
index afcd48251c42b01ba289c27db18399fdffd086fb..401d5cfa5818702bdbe25fb76020c2d27aafe05f 100644 (file)
--- a/test/confs/3401
+++ b/test/confs/3401
@@ -55,14 +55,16 @@ begin transports
 
 smtp_try:
   driver = smtp
 
 smtp_try:
   driver = smtp

-  hosts_try_auth = *

   port = PORT_S
   port = PORT_S

+  hosts_try_fastopen = :
+  hosts_try_auth = *

   authenticated_sender = ${if eq{$local_part}{forcesender}{force@x.y.z}fail}
 
 smtp_force:
   driver = smtp
   authenticated_sender = ${if eq{$local_part}{forcesender}{force@x.y.z}fail}
 
 smtp_force:
   driver = smtp

-  hosts_require_auth = *

   port = PORT_S
   port = PORT_S

+  hosts_try_fastopen = :
+  hosts_require_auth = *

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

diff --git a/test/confs/3404 b/test/confs/3404
index a76581de23b2c528c50b536fdd658e280ff77043..73cb524b0f1ebb2337a7aa78a444b15eae32e472 100644 (file)
--- a/test/confs/3404
+++ b/test/confs/3404
@@ -43,8 +43,9 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

-  hosts_try_auth = *

   port = PORT_S
   port = PORT_S

+  hosts_try_fastopen = :
+  hosts_try_auth = *

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

diff --git a/test/confs/3405 b/test/confs/3405
index e9c7b7ea335d8f6e71500575fe749c2abce4a511..9f37f016b5192df5ea61581bf6b98e44ff0301c4 100644 (file)
--- a/test/confs/3405
+++ b/test/confs/3405
@@ -37,8 +37,9 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  port = PORT_S
+  hosts_try_fastopen = :

   headers_add = X-TAID: >$authenticated_id<
   hosts_try_auth = *
   headers_add = X-TAID: >$authenticated_id<
   hosts_try_auth = *

-  port = PORT_S

 
 # End
 
 # End

diff --git a/test/confs/3412 b/test/confs/3412
index c0a1c5509913ca080aa381e57b1bc8bb7f0b46e0..52849435603412216ff9ce6bec34f0579c7d1be1 100644 (file)
--- a/test/confs/3412
+++ b/test/confs/3412
@@ -44,6 +44,7 @@ smtp:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   hosts_try_auth = *
 
 # End
   hosts_try_auth = *
 
 # End

diff --git a/test/confs/3416 b/test/confs/3416
index 930a2240f9e113e540d4fd0f149adf04c7e0679b..eebb132f36dd2b9cccac04e05422bf3e4d7baf34 100644 (file)
--- a/test/confs/3416
+++ b/test/confs/3416
@@ -51,6 +51,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   hosts_try_auth = *
 
   allow_localhost
   hosts_try_auth = *
 


@@ -58,6 +59,7 @@ t2:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   hosts_try_auth = *
   authenticated_sender= brian
   allow_localhost
   hosts_try_auth = *
   authenticated_sender= brian

diff --git a/test/confs/3451 b/test/confs/3451
index c3f07b948a4291095c784f83f7a2471527def656..160f9e0865e7fd48bb9b73b7aff55052cf4fa522 100644 (file)
--- a/test/confs/3451
+++ b/test/confs/3451
@@ -69,8 +69,9 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1

+  port = PORT_D
+  hosts_try_fastopen = :

   hosts_try_auth = *
   hosts_noproxy_tls = PEX
   hosts_try_auth = *
   hosts_noproxy_tls = PEX

-  port = PORT_D

 
 # End
 
 # End

diff --git a/test/confs/3452 b/test/confs/3452
index 5971c08044157542ab741b33ffff9a54c216ea2b..108d93edc25f4e93ac92af9c9788c749becfcab2 100644 (file)
--- a/test/confs/3452
+++ b/test/confs/3452
@@ -67,8 +67,9 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1

-  hosts_try_auth = *

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_try_auth = *

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

diff --git a/test/confs/3455 b/test/confs/3455
index bfa30b445f7aff8e140c9e3885273df0362b1e12..591d5de37dcb397859a419cf2fb01a8eb99dba39 100644 (file)
--- a/test/confs/3455
+++ b/test/confs/3455
@@ -61,6 +61,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_D
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_D

+  hosts_try_fastopen = :

   hosts_avoid_tls = HOSTS_AVOID_TLS
   hosts_require_auth = *
   allow_localhost
   hosts_avoid_tls = HOSTS_AVOID_TLS
   hosts_require_auth = *
   allow_localhost

diff --git a/test/confs/3461 b/test/confs/3461
index a01a8b20e78f745f8fb7051bd990e27392121abe..35c2a17b26ded605a767371af4d0a3b2cee2cfce 100644 (file)
--- a/test/confs/3461
+++ b/test/confs/3461
@@ -69,9 +69,10 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1

+  port = PORT_D
+  hosts_try_fastopen = :

   hosts_try_auth = *
   hosts_noproxy_tls = PEX
   hosts_try_auth = *
   hosts_noproxy_tls = PEX

-  port = PORT_D

   tls_try_verify_hosts = :
 
 # End
   tls_try_verify_hosts = :
 
 # End

diff --git a/test/confs/3462 b/test/confs/3462
index 33fabbc04ec2f6a95adc44012b99fa08e45467d3..3f8c401de5aac57152bec56c153c2cff63b7c5ff 100644 (file)
--- a/test/confs/3462
+++ b/test/confs/3462
@@ -67,8 +67,9 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1

-  hosts_try_auth = *

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_try_auth = *

   tls_try_verify_hosts = :
 
 
   tls_try_verify_hosts = :
 
 

diff --git a/test/confs/3465 b/test/confs/3465
index dfe6b9921360700977e6ffa2c7b6acb0e0eae8b0..0d97a3a7f3b8990c17fa9bbecb41d9736496ca78 100644 (file)
--- a/test/confs/3465
+++ b/test/confs/3465
@@ -61,6 +61,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_D
   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 = *
   hosts_avoid_tls = HOSTS_AVOID_TLS
   tls_try_verify_hosts = :
   hosts_require_auth = *

diff --git a/test/confs/3501 b/test/confs/3501
index c63e767392bd036ef5301697708a5a3dfd19ce25..b283a2d0dac933b47185d83dba2a2190ee2f6f23 100644 (file)
--- a/test/confs/3501
+++ b/test/confs/3501
@@ -43,14 +43,16 @@ begin transports
 
 smtp_try:
   driver = smtp
 
 smtp_try:
   driver = smtp

-  hosts_try_auth = *

   port = PORT_S
   port = PORT_S

+  hosts_try_fastopen = :
+  hosts_try_auth = *

   authenticated_sender = ${if eq{$local_part}{forcesender}{force@x.y.z}fail}
 
 smtp_force:
   driver = smtp
   authenticated_sender = ${if eq{$local_part}{forcesender}{force@x.y.z}fail}
 
 smtp_force:
   driver = smtp

-  hosts_require_auth = *

   port = PORT_S
   port = PORT_S

+  hosts_try_fastopen = :
+  hosts_require_auth = *

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

diff --git a/test/confs/3600 b/test/confs/3600
index f6d4f8605807d547693e8b27673cd89f27a5bc4e..e955676372abf663245ee2fa85b209c93b7a79b5 100644 (file)
--- a/test/confs/3600
+++ b/test/confs/3600
@@ -63,6 +63,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_D
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_D

+  hosts_try_fastopen = :

   allow_localhost
   hosts_require_auth = *
 
   allow_localhost
   hosts_require_auth = *
 

diff --git a/test/confs/3700 b/test/confs/3700
index 6578ecb2d14737caac69142b56414594424415d3..39e3bcecea4ff245a7a0d60d6b44e52fcef0d516 100644 (file)
--- a/test/confs/3700
+++ b/test/confs/3700
@@ -76,6 +76,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_D
   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
   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
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   protocol = smtps
   allow_localhost
   tls_certificate =         DIR/aux-fixed/cert2
   protocol = smtps
   allow_localhost
   tls_certificate =         DIR/aux-fixed/cert2

diff --git a/test/confs/3720 b/test/confs/3720
index 6d8c46730554ed19758911ffa68b1a35bc016ad7..53a68d31efb6795399673b1b2b943c323d4770af 100644 (file)
--- a/test/confs/3720
+++ b/test/confs/3720
@@ -79,6 +79,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_D
   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
   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 4a1f682a902fbc0f2f80abbd3267a675bd6f2cc4..16f464cd5aba7af3496ed4b536ba45621c4d5a34 100644 (file)
--- a/test/confs/4028
+++ b/test/confs/4028
@@ -48,6 +48,7 @@ begin transports
 my_smtp:
   driver = smtp
   port = PORT_D
 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
   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 467d74d8dd80b2d84b83daf0fa85e02c3450d930..119f8ce55d2e54b53a646ec08032944695ca4dab 100644 (file)
--- a/test/confs/4029
+++ b/test/confs/4029
@@ -48,6 +48,7 @@ begin transports
 my_smtp:
   driver = smtp
   port = PORT_D
 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
   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 17afe9f782fcf8f48f5e08477c6e5ddc893c5ac2..8ded6c27cf799175351f298306ce6aa0ec78df20 100644 (file)
--- a/test/confs/4201
+++ b/test/confs/4201
@@ -124,6 +124,7 @@ local_delivery:
 
 rmt_smtp:
   driver = smtp
 
 rmt_smtp:
   driver = smtp

+  hosts_try_fastopen = :

 .ifdef STRICT
   utf8_downconvert = STRICT
 .endif
 .ifdef STRICT
   utf8_downconvert = STRICT
 .endif

diff --git a/test/confs/4211 b/test/confs/4211
index bcd5a4fd1250c437da07227006db7d6152bed98f..e68111eb7aecafb168c6f96b032a459a508c60df 100644 (file)
--- a/test/confs/4211
+++ b/test/confs/4211
@@ -115,6 +115,7 @@ local_delivery:
 
 rmt_smtp:
   driver = smtp
 
 rmt_smtp:
   driver = smtp

+  hosts_try_fastopen = :

   hosts_require_tls = *
   tls_try_verify_hosts = :
 
   hosts_require_tls = *
   tls_try_verify_hosts = :
 

diff --git a/test/confs/4221 b/test/confs/4221
index bcd5a4fd1250c437da07227006db7d6152bed98f..e68111eb7aecafb168c6f96b032a459a508c60df 100644 (file)
--- a/test/confs/4221
+++ b/test/confs/4221
@@ -115,6 +115,7 @@ local_delivery:
 
 rmt_smtp:
   driver = smtp
 
 rmt_smtp:
   driver = smtp

+  hosts_try_fastopen = :

   hosts_require_tls = *
   tls_try_verify_hosts = :
 
   hosts_require_tls = *
   tls_try_verify_hosts = :
 

diff --git a/test/confs/4520 b/test/confs/4520
index 1f31623427e1c21455cb6e458b1da80b95f96af5..3f49ca99693c2d94f0674c4528ff04e94cac20be 100644 (file)
--- a/test/confs/4520
+++ b/test/confs/4520
@@ -45,6 +45,7 @@ send_to_server:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D

+  hosts_try_fastopen = :

 
   dkim_domain =                test.ex
 .ifdef SELECTOR
 
   dkim_domain =                test.ex
 .ifdef SELECTOR

diff --git a/test/confs/4525 b/test/confs/4525
index f6a0258a7e3851a80fb0cd38e0f61a9df26cc991..e11456cd28bd9089ed19202f6af4fbce90e112a7 100644 (file)
--- a/test/confs/4525
+++ b/test/confs/4525
@@ -68,6 +68,7 @@ send_to_server:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D

+  hosts_try_fastopen = :

 
 .ifdef FILTER
   transport_filter =   /bin/cat - DIR/aux-fixed/TESTNUM.mlistfooter
 
 .ifdef FILTER
   transport_filter =   /bin/cat - DIR/aux-fixed/TESTNUM.mlistfooter

diff --git a/test/confs/4550 b/test/confs/4550
index 15178f363f37971f9eb1d133688609f1b4d32709..4b596f3007f7d84d8466b960ec5bdf05f2850c2d 100644 (file)
--- a/test/confs/4550
+++ b/test/confs/4550
@@ -49,6 +49,7 @@ send_to_server:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D

+  hosts_try_fastopen = :

 
   dkim_domain =                ${if def:sender_address_local_part {test.ex}}
   dkim_selector =      sel
 
   dkim_domain =                ${if def:sender_address_local_part {test.ex}}
   dkim_selector =      sel

diff --git a/test/confs/4700 b/test/confs/4700
index 96f3beac19c333913dbb16b52e1b5ab8de19f977..86d8b6d8d7f0df877f9e01c3041712467c9367e6 100644 (file)
--- a/test/confs/4700
+++ b/test/confs/4700
@@ -48,6 +48,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

diff --git a/test/confs/4800 b/test/confs/4800
index 876e81d949b1457b6ca94d856b4e73f3451a87c9..f342f28223a40918eeb2c2c0c5b7f5d5435d239c 100644 (file)
--- a/test/confs/4800
+++ b/test/confs/4800
@@ -12,3 +12,4 @@ begin routers
 begin transports
   smtp:
      driver = smtp
 begin transports
   smtp:
      driver = smtp

+  hosts_try_fastopen = :

diff --git a/test/confs/4801 b/test/confs/4801
index 9a09b0289a36536f194b20ea5955c64e1f76a725..5241ad3facfe70cd669e6560f15cb2d7578aa8bb 100644 (file)
--- a/test/confs/4801
+++ b/test/confs/4801
@@ -12,3 +12,4 @@ begin routers
 begin transports
   smtp:
      driver = smtp
 begin transports
   smtp:
      driver = smtp

+  hosts_try_fastopen = :

diff --git a/test/confs/4802 b/test/confs/4802
index b37eba738129db57c18f102f850d2c6855c1dfca..47e2e6e5edc8f1bd78004d615d35685b4bd729bb 100644 (file)
--- a/test/confs/4802
+++ b/test/confs/4802
@@ -12,3 +12,4 @@ begin routers
 begin transports
   smtp:
      driver = smtp
 begin transports
   smtp:
      driver = smtp

+  hosts_try_fastopen = :

diff --git a/test/confs/4803 b/test/confs/4803
index bb2afffad3cbbf37475fa19daa7e1f1b9157e24a..41381a47fca351878ea43d7e5220a696fd6acd2d 100644 (file)
--- a/test/confs/4803
+++ b/test/confs/4803
@@ -13,3 +13,4 @@ begin routers
 begin transports
   smtp:
      driver = smtp
 begin transports
   smtp:
      driver = smtp

+  hosts_try_fastopen = :

diff --git a/test/confs/4804 b/test/confs/4804
index a891d14dc41da465c865f94a290627c34385d53e..1513d46882bf932e65dc84e4b0ef48ddbf373690 100644 (file)
--- a/test/confs/4804
+++ b/test/confs/4804
@@ -40,5 +40,6 @@ begin transports
 send_to_server:
   driver = smtp
   port = PORT_D
 send_to_server:
   driver = smtp
   port = PORT_D

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/4950 b/test/confs/4950
index 6ddee035e1efb48d8c38cde6b1ad668f159f3270..c4395b51488554b5e8f8a976379856fcf80d16db 100644 (file)
--- a/test/confs/4950
+++ b/test/confs/4950
@@ -32,6 +32,7 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/5204 b/test/confs/5204
index 5f379b8f115f20c51c5a74d9570653d8e5f3450b..e81c58e9840a6f20f19e1a0b2a709c86f3e63408 100644 (file)
--- a/test/confs/5204
+++ b/test/confs/5204
@@ -51,9 +51,11 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

 
 other_smtp:
   driver = smtp
 
 other_smtp:
   driver = smtp

+  hosts_try_fastopen = :

 
 null:
   driver = appendfile
 
 null:
   driver = appendfile

diff --git a/test/confs/5205 b/test/confs/5205
index efa2de1215f83eff4b9c17fc77eae68150055cc0..4eeee700036d4729ebe81e23c6f6448e1e508ed7 100644 (file)
--- a/test/confs/5205
+++ b/test/confs/5205
@@ -27,5 +27,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/5206 b/test/confs/5206
index 37e89e65f2e1d036283a3ff8a542406db68b77ff..27aff6eba809a42f6693231f48578806a7d8e64f 100644 (file)
--- a/test/confs/5206
+++ b/test/confs/5206
@@ -29,6 +29,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/5208 b/test/confs/5208
index e32dcfc947bbae29de287c4bb4781ac3caa1d027..988183b3676885c2e9cf1cef82055206e45d9f40 100644 (file)
--- a/test/confs/5208
+++ b/test/confs/5208
@@ -28,5 +28,6 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/confs/5300 b/test/confs/5300
index 1ba89388ba9eacec6f85bd3a1ae8ac7c06ead60a..165e0ea08eaffbf881ac0bf7dff89a0c9a35046d 100644 (file)
--- a/test/confs/5300
+++ b/test/confs/5300
@@ -19,6 +19,7 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

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

diff --git a/test/confs/5301 b/test/confs/5301
index f727ebca0e2ca6eaac912fd8d82436fdc9aa4fb4..7bc161d61583a10d80fe6877137bf93f584e34ea 100644 (file)
--- a/test/confs/5301
+++ b/test/confs/5301
@@ -20,6 +20,7 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

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

diff --git a/test/confs/5400 b/test/confs/5400
index 980e02a48222ada0bb425f683665938d85df3590..9693818b1b091891287b082bd89ade81627a383b 100644 (file)
--- a/test/confs/5400
+++ b/test/confs/5400
@@ -65,12 +65,14 @@ smtp:
   driver = smtp
   interface = HOSTIPV4
   port = PORT_S
   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
   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
 
 
 # End

diff --git a/test/confs/5401 b/test/confs/5401
index 0d93fe5bc991167b5a590920cf21ae0bab5dc700..2b1a4c43e127e8c42a6e207fb28eab241c919847 100644 (file)
--- a/test/confs/5401
+++ b/test/confs/5401
@@ -40,6 +40,7 @@ smtp:
   driver = smtp
   interface = HOSTIPV4
   port = PORT_S
   driver = smtp
   interface = HOSTIPV4
   port = PORT_S

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/5402 b/test/confs/5402
index 0984e0cc94a95a9f0bca969f3c2206e189df62c6..92c5632304e249126b71ae986b7a120cac4bff95 100644 (file)
--- a/test/confs/5402
+++ b/test/confs/5402
@@ -42,6 +42,7 @@ smtp:
   driver = smtp
   interface = HOSTIPV4
   port = PORT_S
   driver = smtp
   interface = HOSTIPV4
   port = PORT_S

+  hosts_try_fastopen = :

 
 
 # End
 
 
 # End

diff --git a/test/confs/5403 b/test/confs/5403
index a4576a5aa1537f08513b9ce0ef0d89bf62d487f7..a95334bc508a4c91e6c6c13388f19cee215102ed 100644 (file)
--- a/test/confs/5403
+++ b/test/confs/5403
@@ -53,12 +53,14 @@ smtp:
   driver = smtp
   interface = HOSTIPV4
   port = PORT_S
   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
   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
 
 
 # End

diff --git a/test/confs/5410 b/test/confs/5410
index 96ec87496d6351f42aae94be11ec669fb3bb4629..e00234363319b33e55923a62ed5d5b78a2343656 100644 (file)
--- a/test/confs/5410
+++ b/test/confs/5410
@@ -47,6 +47,7 @@ smtp:
   driver = smtp
   interface = HOSTIPV4
   port = PORT_D
   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 = :
   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 44a1fdee4ea3a93d09894d2baad701400af9324c..488000e7a83d875f2252917b409352bca0b34f11 100644 (file)
--- a/test/confs/5420
+++ b/test/confs/5420
@@ -47,6 +47,7 @@ smtp:
   driver = smtp
   interface = HOSTIPV4
   port = PORT_D
   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}{*}{:}}
 
   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 ab42b242e432a9edf96030693aab28e25efed9b3..9c01e63a71d6796c38f2b322f99b0d5ef9ede0d4 100644 (file)
--- a/test/confs/5510
+++ b/test/confs/5510
@@ -37,6 +37,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   hosts_try_prdr = *
 
   allow_localhost
   hosts_try_prdr = *
 

diff --git a/test/confs/5601 b/test/confs/5601
index 9b33101b39cb26d1ba1064957a04650008b2066b..fdd3d80dfe20f4bfeb014202dc8b6d1817c33477 100644 (file)
--- a/test/confs/5601
+++ b/test/confs/5601
@@ -94,6 +94,7 @@ send_to_server1:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   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 = *
   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
   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 = *
   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
   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 =
   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
   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 =
   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 0b2be46a1719e720256e69ebfcf2ee21804442eb..9ba6350cce62a00710166adec80b1388a286b077 100644 (file)
--- a/test/confs/5611
+++ b/test/confs/5611
@@ -94,6 +94,7 @@ send_to_server1:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   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 = *
   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
   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 = *
   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
   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 =
   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
   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 =
   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 01fa4552467f70191ce1fb23b749c0cbcab4f992..1e3ed5a1e0996bdac6ace6907e2491487484a3ce 100644 (file)
--- a/test/confs/5651
+++ b/test/confs/5651
@@ -92,6 +92,7 @@ send_to_server1:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   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 = *
   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
   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 = *
   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
   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
   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
   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
   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 da6e5197a9f6206cbfcb7e37b6f8bbab85cea8f7..673ec66567fef9150c7b2ddf91ea25bd9764432c 100644 (file)
--- a/test/confs/5652
+++ b/test/confs/5652
@@ -74,6 +74,7 @@ begin transports
 remote_delivery:
   driver =                     smtp
   port =                       PORT_D
 remote_delivery:
   driver =                     smtp
   port =                       PORT_D

+  hosts_try_fastopen =         :

   hosts_require_tls =          *
 .ifdef _HAVE_GNUTLS
   tls_require_ciphers =                NONE:\
   hosts_require_tls =          *
 .ifdef _HAVE_GNUTLS
   tls_require_ciphers =                NONE:\

diff --git a/test/confs/5700 b/test/confs/5700
index 774e766054ce72fa038590c52097af52658c1e0c..758d7d16aa30aac7bcb9184173d0e8e77d7a5aea 100644 (file)
--- a/test/confs/5700
+++ b/test/confs/5700
@@ -43,6 +43,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

   command_timeout = 1s
   final_timeout = 1s
   event_action =   ${acl {logger}}
   command_timeout = 1s
   final_timeout = 1s
   event_action =   ${acl {logger}}

diff --git a/test/confs/5702 b/test/confs/5702
index dfc063fa7def563e8d42935364a3bbb88466fa2f..e796406c8f0323f396dad68b96ff439f78d3339f 100644 (file)
--- a/test/confs/5702
+++ b/test/confs/5702
@@ -38,6 +38,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

   event_action = ${acl {logger}}
 
 # End
   event_action = ${acl {logger}}
 
 # End

diff --git a/test/confs/5703 b/test/confs/5703
index 267f5fc8d1132d487fd3f6afffac4da4e899469c..becd0050cdfd21850a8ef4d7df6b6060d1b76d58 100644 (file)
--- a/test/confs/5703
+++ b/test/confs/5703
@@ -38,6 +38,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

   event_action = ${acl {logger}}
 
 # End
   event_action = ${acl {logger}}
 
 # End

diff --git a/test/confs/5710 b/test/confs/5710
index 85293a566b0519fc244bf8fa3e1e1ede6c4e600d..f6b97945f2a462740aa451d6ef1ea2751191577e 100644 (file)
--- 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
   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
 
   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 90626629035092f0917aa2aee72b8eca983a49c1..2c0e327ce0729f2e927a6d4d6c26a7d920c43597 100644 (file)
--- 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
   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
 
   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 2b32008d4ab4f32c0c76da24a1512ca1cb11978e..c7d07bf3c688ba36b208250d7ff6d6ca2d3518dd 100644 (file)
--- a/test/confs/5730
+++ b/test/confs/5730
@@ -100,6 +100,7 @@ send_to_server1:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   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 = *
   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
   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 = *
   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
   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
   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
   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
   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 53302c50783e961c50d3d446d8aca38429b161c9..60c175b53863ae307cfa20d1866e307a6f256565 100644 (file)
--- a/test/confs/5740
+++ b/test/confs/5740
@@ -102,6 +102,7 @@ send_to_server1:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   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 =  *
   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
   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 =  *
   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
   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 =
   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
   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 =
   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 b038558deb02162499b77c3519100091e9a354f4..76dc75efef42f6590469f14de7d903c82ed92647 100644 (file)
--- a/test/confs/5820
+++ b/test/confs/5820
@@ -66,6 +66,7 @@ send_to_server:
   driver = smtp
   allow_localhost
   port = PORT_D
   driver = smtp
   allow_localhost
   port = PORT_D

+  hosts_try_fastopen = :

 
   hosts_try_dane =     CONTROL
   hosts_require_dane = HOSTIPV4
 
   hosts_try_dane =     CONTROL
   hosts_require_dane = HOSTIPV4

diff --git a/test/confs/5840 b/test/confs/5840
index bda328a97668c59549503817150f16d24cd4b367..5852ef2c0ab018a12e0c2e45b2894817dd37c0a5 100644 (file)
--- a/test/confs/5840
+++ b/test/confs/5840
@@ -71,6 +71,7 @@ send_to_server:
   driver = smtp
   allow_localhost
   port = PORT_D
   driver = smtp
   allow_localhost
   port = PORT_D

+  hosts_try_fastopen = :

 
   hosts_try_dane =     CONTROL
   hosts_require_dane = HOSTIPV4
 
   hosts_try_dane =     CONTROL
   hosts_require_dane = HOSTIPV4

diff --git a/test/confs/5860 b/test/confs/5860
index df9115129cff3e5b7f36d8c868f5330759b26dfc..bef70dd18730277c6e5a2bcf0446e14412f8ff57 100644 (file)
--- a/test/confs/5860
+++ b/test/confs/5860
@@ -61,6 +61,7 @@ send_to_server:
   driver = smtp
   allow_localhost
   port = PORT_D
   driver = smtp
   allow_localhost
   port = PORT_D

+  hosts_try_fastopen = :

 
 #  hosts_try_dane = *
   hosts_require_dane = *
 
 #  hosts_try_dane = *
   hosts_require_dane = *

diff --git a/test/confs/5861 b/test/confs/5861
index 93e2bb715b848628bbe9ef43858c4be0def11c48..68c790ef6f21e17cb4cf34eb983c24b856a362db 100644 (file)
--- a/test/confs/5861
+++ b/test/confs/5861
@@ -75,6 +75,7 @@ send_to_server:
   driver = smtp
   allow_localhost
   port = PORT_D
   driver = smtp
   allow_localhost
   port = PORT_D

+  hosts_try_fastopen = :

 
   hosts_try_dane =     *
   hosts_require_dane = HOSTIPV4
 
   hosts_try_dane =     *
   hosts_require_dane = HOSTIPV4

diff --git a/test/confs/5880 b/test/confs/5880
index 4becdd42353d280b93924d372416576173bb4d93..ef7c59445eff30d0a9c7dfc196c7ee3dbf3c4588 100644 (file)
--- a/test/confs/5880
+++ b/test/confs/5880
@@ -61,6 +61,7 @@ send_to_server:
   driver = smtp
   allow_localhost
   port = PORT_D
   driver = smtp
   allow_localhost
   port = PORT_D

+  hosts_try_fastopen = :

 
 #  hosts_try_dane = *
   hosts_require_dane = *
 
 #  hosts_try_dane = *
   hosts_require_dane = *

diff --git a/test/confs/5890 b/test/confs/5890
index f1aa9a2aea48d27ae620ef6c61179216abaf2bce..5b154e5dbd458b8a0a4034d0fab721ac3250e66d 100644 (file)
--- a/test/confs/5890
+++ b/test/confs/5890
@@ -100,6 +100,7 @@ send_to_server2:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   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}}
   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 190ce253731d1505644168ea59ce0f1e9ee4e1ab..e0f824357a96bcca1504cece804459773e2eec59 100644 (file)
--- a/test/confs/5891
+++ b/test/confs/5891
@@ -100,6 +100,7 @@ send_to_server2:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   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}}
   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 c042cd39a409cd9a2eb79074c0fc8120f1a8b933..0f25f291880e6ff9868e229ba28fe035e167dceb 100644 (file)
--- a/test/confs/9900
+++ b/test/confs/9900
@@ -26,6 +26,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

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

diff --git a/test/confs/9901 b/test/confs/9901
index 23ea43fefdf8fa25316ab7546beb8c8affb11f8f..a33223b05a77758fb6660c97e4c4d4cc2ecaba34 100644 (file)
--- a/test/confs/9901
+++ b/test/confs/9901
@@ -47,6 +47,7 @@ t1:
   hosts = 127.0.0.1
   hosts_override
   port = PORT_D
   hosts = 127.0.0.1
   hosts_override
   port = PORT_D

+  hosts_try_fastopen = :

 
 t2:
   driver = appendfile
 
 t2:
   driver = appendfile

diff --git a/test/confs/9903 b/test/confs/9903
index 7ef2c620a8b71e80816e0e6f2b898a078d29d503..6f79e360edfa74ad203ba2b73971f42c6910f423 100644 (file)
--- a/test/confs/9903
+++ b/test/confs/9903
@@ -26,6 +26,7 @@ smtp:
   port = PORT_S
   hosts = 127.0.0.1
   allow_localhost
   port = PORT_S
   hosts = 127.0.0.1
   allow_localhost

+  hosts_try_fastopen = :

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

diff --git a/test/runtest b/test/runtest
index c6fd5ce5443925141ea736bfbf4a8c8dddf855fa..30315044fa6f62e3dd74ea4246450bab8209fce6 100755 (executable)
--- 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
     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>;
       {
       chomp;
       $_ .= <IN>;

diff --git a/test/stderr/5204 b/test/stderr/5204
index 1f927a4855c6d3801a71d13a0f5b3be6601a6f50..f84acadd85969d4b679717816212475e2406daf0 100644 (file)
--- 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)
 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)"@some.host
 check verify = recipient
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "FAIL cannot route this one (FAIL)"@some.host

diff --git a/test/stderr/5410 b/test/stderr/5410
index 5fc3c82eaa8347788402f93c515399e13defbf50..9953eee7cd2f31e396d237708388f899e4a8f940 100644 (file)
--- 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 ------------
   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
 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 ------------
   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
 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 ------------
   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
 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 e8ea2bcf479dbfb912237862cd2817893f5414df..d8325430732e5e101ced85b36dbe013a14fdf213 100644 (file)
--- 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 ------------
   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
 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 ------------
   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
 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 ------------
   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
 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 21d5127ff69af7842ef34504b23f36aa67720c36..032f2b9f337614fc7e7b25ee47a517c45c48d8f6 100644 (file)
--- 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)
 >>> 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@dane256ee.test.ex
 >>> check verify = recipient/callout
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing rcptuser@dane256ee.test.ex

diff --git a/test/stderr/5840 b/test/stderr/5840
index bc9b18c846e88f528714dd7c178fa89c930319ba..dbd4d235cffef343f330847ec4f026788d261442 100644 (file)
--- 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)
 >>> 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@dane256ee.test.ex
 >>> check verify = recipient/callout
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing rcptuser@dane256ee.test.ex

diff --git a/test/stdout/0572 b/test/stdout/0572
index 44ced8ce3cd98f70e7cc199d339acae8d8a14323..06cc972a146817f81d301d5f2a26e415a1f07e51 100644 (file)
--- 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_require_auth = 
 hosts_try_auth = 
 hosts_try_chunking = *

-hosts_try_fastopen = *
+hosts_try_fastopen = :

 hosts_try_prdr = *
 interface = ip4.ip4.ip4.ip4
 keepalive
 hosts_try_prdr = *
 interface = ip4.ip4.ip4.ip4
 keepalive


@@ -110,6 +110,7 @@ begin transports
     driver = smtp
     interface = ip4.ip4.ip4.ip4
     port = 1224
     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"
     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
 driver = smtp
 interface = ip4.ip4.ip4.ip4
 port = 1224

+hosts_try_fastopen = :

 debug_print = transport_name <$transport_name>
 debug_print = transport_name <$transport_name>