From: W.C.A. Wijngaards Date: Wed, 2 Dec 2020 14:42:24 +0000 (+0100) Subject: - Fix for #283: fix stream reuse and tcp fast open. X-Git-Tag: release-1.13.1rc1~56 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0502ab3026af59673b21133eb7c5a72126b37d66;p=thirdparty%2Funbound.git - Fix for #283: fix stream reuse and tcp fast open. --- diff --git a/doc/Changelog b/doc/Changelog index 9d055b5df..890e439fe 100644 --- 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 e7a674f8a..eca2df83f 100644 --- 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)) {