BUG/MINOR: mux-h2: do not use timeout http-keep-alive on backend side

Commit 15a4733d5 ("BUG/MEDIUM: mux-h2: make use of http-request and
keep-alive timeouts") omitted to check the side of the connection, and
as a side effect, automatically enabled timeouts on idle backend
connections, which is totally contrary to the principle that they
must be autonomous.

This needs to be backported wherever the patch above is backported.

(cherry picked from commit 6ff91e20232821e8b59bb0bbd36ea7e851b42566)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit cf4334966540446ba5f5cb93f885de9cd5c73951)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 46f9bb4b7585b8c801c70dfa50865582b2b22932)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>

diff --git a/src/mux_h2.c b/src/mux_h2.c
index 987ec0f..b03ce40 100644 (file)
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -702,7 +702,7 @@ static void h2c_update_timeout(struct h2c *h2c)
                } else if (br_data(h2c->mbuf)) {
                        /* pending output data: always the regular data timeout */
                        h2c->task->expire = tick_add_ifset(now_ms, h2c->timeout);
-               } else if (h2c->max_id > 0 && !b_data(&h2c->dbuf)) {
+               } else if (!(h2c->flags & H2_CF_IS_BACK) && h2c->max_id > 0 && !b_data(&h2c->dbuf)) {
                        /* idle after having seen one stream => keep-alive */
                        h2c->task->expire = tick_add_ifset(h2c->idle_start, h2c->proxy->timeout.httpka);
                } else {