- 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 d13133d46f60f1cbcd494257bcd51899871488fa..1622426c228dbde1f18e6171894b15b5f80feb60 100644 (file)
--- 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 0eb690344a5ef135c76a98fed5c018e69d3f3568..cd74a8dbc130209680acc8b32d08f050e96413eb 100644 (file)
--- 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 */