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.
(cherry picked from commit 227424450c874cd17fbf81af487c2f2775668877)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit df6e94633ebf2f2c488229931885c0dac8be875a)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 3195f9a0aa9ad8bf1cd6041df60bfe7b91cf7bd7)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
diff --git a/src/mux_h1.c b/src/mux_h1.c
index f407492..c29c4ed 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -2556,9 +2556,10 @@
_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;
}