]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: mux-h2: Fix missing braces because of traces in h2_detach()
authorChristopher Faulet <cfaulet@haproxy.com>
Thu, 26 Sep 2019 14:15:10 +0000 (16:15 +0200)
committerChristopher Faulet <cfaulet@haproxy.com>
Thu, 26 Sep 2019 14:51:02 +0000 (16:51 +0200)
Braces was missing aroung a "if" statement in the function h2_detach(), leaving
an unconditional return.

No backport needed.

src/mux_h2.c

index cfbc0ad6b27cba31a8657f6749aef3060a53cb3c..ef046203a5d98dfcac6d7896fda19cdb52b233f7 100644 (file)
@@ -3786,10 +3786,11 @@ static void h2_detach(struct conn_stream *cs)
                                }
                        }
                        if (eb_is_empty(&h2c->streams_by_id)) {
-                               if (session_check_idle_conn(h2c->conn->owner, h2c->conn) != 0)
+                               if (session_check_idle_conn(h2c->conn->owner, h2c->conn) != 0) {
                                        /* At this point either the connection is destroyed, or it's been added to the server idle list, just stop */
                                        TRACE_DEVEL("leaving without reusable idle connection", H2_EV_STRM_END);
                                        return;
+                               }
                        }
                        /* Never ever allow to reuse a connection from a non-reuse backend */
                        if ((h2c->proxy->options & PR_O_REUSE_MASK) == PR_O_REUSE_NEVR)