From: W.C.A. Wijngaards Date: Wed, 27 May 2026 11:17:35 +0000 (+0200) Subject: - Fix to reset the tcp-timeout before applying a load based X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=d2e1ea7d190f2c71ce40f4eac6bf1bafb9207414;p=thirdparty%2Funbound.git - Fix to reset the tcp-timeout before applying a load based reduction. Thanks to Qifan Zhang, Palo Alto Networks, for the report. --- diff --git a/doc/Changelog b/doc/Changelog index d13133d46..1622426c2 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -10,6 +10,9 @@ - Fix that msgencode insert_query has the correct assertion, for a local_alias. Thanks to Qifan Zhang, Palo Alto Networks, for the report. + - Fix to reset the tcp-timeout before applying a load based + reduction. Thanks to Qifan Zhang, Palo Alto Networks, for the + report. 26 May 2026: Wouter - Fix for mesh new client and mesh new callback to rollback the diff --git a/util/netevent.c b/util/netevent.c index 0eb690344..cd74a8dbc 100644 --- a/util/netevent.c +++ b/util/netevent.c @@ -2940,6 +2940,8 @@ setup_tcp_handler(struct comm_point* c, int fd, int cur, int max) c->tcp_is_reading = 1; c->tcp_byte_count = 0; c->tcp_keepalive = 0; + /* reset to configured value before applying load-based reduction */ + c->tcp_timeout_msec = c->tcp_parent->tcp_timeout_msec; /* if more than half the tcp handlers are in use, use a shorter * timeout for this TCP connection, we need to make space for * other connections to be able to get attention */