From: Amaury Denoyelle Date: Fri, 8 Aug 2025 13:12:59 +0000 (+0200) Subject: BUG/MINOR: mux-h1: fix wrong lock label X-Git-Tag: v3.0.12~66 X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=b4fe718978a34838fb0d93e1f2628fe959fb3ea5;p=haproxy-3.0.git BUG/MINOR: mux-h1: fix wrong lock label 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. (cherry picked from commit 8ac54cafcda749a5b50532b3a10d39a5a37ce9b3) Signed-off-by: Christopher Faulet (cherry picked from commit 8969387e94cb5ac0562b1bfe8d01cc0131b9652e) Signed-off-by: Christopher Faulet (cherry picked from commit 50a5aa77a1811fde4787fed552126f329eb1e744) Signed-off-by: Christopher Faulet --- diff --git a/src/mux_h1.c b/src/mux_h1.c index 76d72a8..32d539d 100644 --- a/src/mux_h1.c +++ b/src/mux_h1.c @@ -4260,7 +4260,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; }