- Fix #798: Client-side TCP fast open fails (Linux).

git-svn-id: file:///svn/unbound/trunk@3819 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 3eda093103420188c20d803c172cb4cb06868fef..08926476c7a9c59cf3664dabca5f42a01ff04b44 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+18 July 2016: Wouter
+       - Fix #798: Client-side TCP fast open fails (Linux).
+
 14 July 2016: Wouter
        - TCP Fast open patch from Sara Dickinson.
        - Fixed unbound.doxygen for 1.8.11.

diff --git a/services/outside_network.c b/services/outside_network.c
index ac7f08697287fdda98cc297c9071ae88fd988d6f..a19417822f72e5b214cca6bfdbd8c4c636e50675 100644 (file)
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -260,6 +260,7 @@ outnet_tcp_take_into_use(struct waiting_tcp* w, uint8_t* pkt, size_t pkt_len)
                     NULL, 0, NULL, NULL) == -1) {
 #else /* USE_OSX_MSG_FASTOPEN*/
 #ifdef USE_MSG_FASTOPEN
+       pend->c->tcp_do_fastopen = 1;
        /* Only do TFO for TCP in which case no connect() is required here.
           Don't combine client TFO with SSL, since OpenSSL can't 
           currently support doing a handshake on fd that already isn't connected*/