]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: mux-h1: fix wrong lock label
authorAmaury Denoyelle <adenoyelle@haproxy.com>
Fri, 8 Aug 2025 13:12:59 +0000 (15:12 +0200)
committerAmaury Denoyelle <adenoyelle@haproxy.com>
Thu, 14 Aug 2025 14:31:25 +0000 (16:31 +0200)
Wrong lock label is used when manipulating idle lock on h1_timeout_task.
Fix this by replacing OTHER_LOCK by IDLE_CONNS_LOCK.

This only concerns thread debugging statistics.

This must be backported up to 2.4.

src/mux_h1.c

index 839c9b9c3666c8452afbfa803be2f9c2db096a2e..67c55fd3b5b8774cd4ccce03e5ed0c4b2d86df58 100644 (file)
@@ -4410,7 +4410,7 @@ struct task *h1_timeout_task(struct task *t, void *context, unsigned int state)
                        se_fl_set(h1c->h1s->sd, SE_FL_EOS | SE_FL_ERROR);
                        h1_alert(h1c->h1s);
                        h1_refresh_timeout(h1c);
-                       HA_SPIN_UNLOCK(OTHER_LOCK, &idle_conns[tid].idle_conns_lock);
+                       HA_SPIN_UNLOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock);
                        TRACE_DEVEL("waiting to release the SC before releasing the connection", H1_EV_H1C_WAKE);
                        return t;
                }