From 227424450c874cd17fbf81af487c2f2775668877 Mon Sep 17 00:00:00 2001 From: Christopher Faulet Date: Wed, 23 Nov 2022 16:58:22 +0100 Subject: [PATCH] BUG/MINOR: mux-h1: Fix handling of 408-Request-Time-Out When a timeout is detected waiting for the request, a 408-Request-Time-Out response is sent. However, an error was introduced by commit 6858d76cd3 ("BUG/MINOR: mux-h1: Obey dontlognull option for empty requests"). Instead of inhibiting the log message, the option was stopping the error sending. Of course, we must do the opposite. This patch must be backported as far as 2.4. --- src/mux_h1.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mux_h1.c b/src/mux_h1.c index 15abff3d7..55b5ca4b5 100644 --- a/src/mux_h1.c +++ b/src/mux_h1.c @@ -2749,9 +2749,10 @@ static int h1_handle_req_tout(struct h1c *h1c) _HA_ATOMIC_INC(&sess->listener->counters->failed_req); h1c->errcode = 408; + ret = h1_send_error(h1c); if (b_data(&h1c->ibuf) || !(sess->fe->options & PR_O_NULLNOLOG)) - ret = h1_send_error(h1c); - sess_log(sess); + sess_log(sess); + end: return ret; }