- Fix for #283: fix stream reuse and tcp fast open.

diff --git a/doc/Changelog b/doc/Changelog
index 9d055b5dfdfd07c30870e38d1d0405fc160830b0..890e439feb1f6abe8446ff67ee55ee7aad4026b1 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -6,6 +6,7 @@
        - Fix unbound-dnstap-socket to not use log routine from interrupt
          handler and not print so frequently when invoked in sequence.
        - Fix on windows to ignore connection failure on UDP, unless verbose.
+       - Fix for #283: fix stream reuse and tcp fast open.
 
 1 December 2020: Wouter
        - Fix #358: Squelch udp connect 'no route to host' errors on low

diff --git a/util/netevent.c b/util/netevent.c
index e7a674f8a5c53b1b618624e4d17bae61a6355e2c..eca2df83fd1848bdddb31a80c972dc7ca9faf26f 100644 (file)
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -2064,7 +2064,11 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg)
                }
                return;
        }
-       if(event&UB_EV_READ) {
+       if(event&UB_EV_READ
+#ifdef USE_MSG_FASTOPEN
+               && !c->tcp_do_fastopen
+#endif
+               ) {
                int has_tcpq = (c->tcp_req_info != NULL);
                int* moreread = c->tcp_more_read_again;
                if(!comm_point_tcp_handle_read(fd, c, 0)) {