From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 23 Oct 2016 16:57:43 +0000 (+0100)
Subject: TFO: feature advertisement
X-Git-Tag: exim-4_88_RC3^0
X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/1a2dfad52a761f9b3ea139e68df37a3739c7da8a?hp=ef8176594c130feebefad040420fbc4d637e9571

TFO: feature advertisement
---

diff --git a/src/src/exim.c b/src/src/exim.c
index b1fff4ddf..e63997030 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -840,6 +840,9 @@ fprintf(f, "Support for:");
 #ifdef SUPPORT_SOCKS
   fprintf(f, " SOCKS");
 #endif
+#ifdef TCP_FASTOPEN
+  fprintf(f, " TCP_Fast_Open");
+#endif
 #ifdef EXPERIMENTAL_LMDB
   fprintf(f, " Experimental_LMDB");
 #endif
diff --git a/src/src/readconf.c b/src/src/readconf.c
index a23a57ce8..f53a5d27a 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -762,6 +762,9 @@ due to conflicts with other common macros. */
 #ifdef SUPPORT_SOCKS
   macro_create(US"_HAVE_SOCKS", US"y", FALSE, TRUE);
 #endif
+#ifdef TCP_FASTOPEN
+  macro_create(US"_HAVE_TCP_FASTOPEN", US"y", FALSE, TRUE);
+#endif
 #ifdef EXPERIMENTAL_LMDB
   macro_create(US"_HAVE_LMDB", US"y", FALSE, TRUE);
 #endif
diff --git a/test/stderr/0432 b/test/stderr/0432
index 333d26cf6..2abb55cc1 100644
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -255,8 +255,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> callout cache: no domain record found for b
 >>> callout cache: no address record found for a@b
 >>> interface=NULL port=1224
->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 127.0.0.1 in hosts_try_fastopen? no (option unset)
->>> connected
+>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 127.0.0.1 >>> connected
 >>>   SMTP<< 220 server ready
 >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex
@@ -301,8 +300,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> callout cache: no domain record found for q
 >>> callout cache: no address record found for p1@q
 >>> interface=NULL port=1224
->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 127.0.0.1 in hosts_try_fastopen? no (option unset)
->>> connected
+>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 127.0.0.1 >>> connected
 >>>   SMTP<< 220 server ready
 >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex
diff --git a/test/stderr/5403 b/test/stderr/5403
index 0ae10f727..a4104fe3c 100644
--- a/test/stderr/5403
+++ b/test/stderr/5403
@@ -69,8 +69,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> Attempting full verification using callout
 >>> callout cache: disabled by no_cache
 >>> interface=ip4.ip4.ip4.ip4 port=1224
->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... 127.0.0.1 in hosts_try_fastopen? no (option unset)
->>> connected
+>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... 127.0.0.1 >>> connected
 >>>   SMTP<< 220 server ready
 >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex