]> git.ipfire.org Git - thirdparty/unbound.git/commitdiff
- Fix stream reuse and tcp fast open. release-1.13.0
authorW.C.A. Wijngaards <wouter@nlnetlabs.nl>
Thu, 3 Dec 2020 08:25:06 +0000 (09:25 +0100)
committerW.C.A. Wijngaards <wouter@nlnetlabs.nl>
Thu, 3 Dec 2020 08:25:06 +0000 (09:25 +0100)
util/netevent.c

index 311a114ee613a37b6619a35ef26ac8c7a4e55426..8bbad15920a2d1aa1536b7b58ecc17f57659b107 100644 (file)
@@ -2042,7 +2042,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 && (event&UB_EV_WRITE))
+#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)) {