From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 3 Dec 2020 08:25:06 +0000 (+0100)
Subject: - Fix stream reuse and tcp fast open.
X-Git-Tag: release-1.13.0^0
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d09e193403f36d2a10dccd7c6ffab45191af9a18;p=thirdparty%2Funbound.git

- Fix stream reuse and tcp fast open.
---

diff --git a/util/netevent.c b/util/netevent.c
index 311a114ee..8bbad1592 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -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)) {