From: Christopher Faulet <cfaulet@haproxy.com>
Date: Thu, 26 Sep 2019 14:15:10 +0000 (+0200)
Subject: BUG/MINOR: mux-h2: Fix missing braces because of traces in h2_detach()
X-Git-Tag: v2.1-dev2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b2d930ebe63a9e995a8473d109b5d1891ee941ed;p=thirdparty%2Fhaproxy.git

BUG/MINOR: mux-h2: Fix missing braces because of traces in h2_detach()

Braces was missing aroung a "if" statement in the function h2_detach(), leaving
an unconditional return.

No backport needed.
---

diff --git a/src/mux_h2.c b/src/mux_h2.c
index cfbc0ad6b2..ef046203a5 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -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)