From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 2 Dec 2020 15:17:26 +0000 (+0100)
Subject: - Fix update, with write event check with streamreuse and fastopen.
X-Git-Tag: release-1.13.1rc1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9eeb95a960460399d66f13fca02fb50464c50e10;p=thirdparty%2Funbound.git

- Fix update, with write event check with streamreuse and fastopen.
---

diff --git a/doc/Changelog b/doc/Changelog
index 890e439fe..4b6a4a318 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -7,6 +7,7 @@
 	  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.
+	- Fix update, with write event check with streamreuse and fastopen.
 
 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 eca2df83f..d3e268a01 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -2066,7 +2066,7 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg)
 	}
 	if(event&UB_EV_READ
 #ifdef USE_MSG_FASTOPEN
-		&& !c->tcp_do_fastopen
+		&& !(c->tcp_do_fastopen && (event&UB_EV_WRITE))
 #endif
 		) {
 		int has_tcpq = (c->tcp_req_info != NULL);