From: Tim Duesterhus <tim@bastelstu.be>
Date: Mon, 21 Dec 2020 18:40:16 +0000 (+0100)
Subject: BUG/MEDIUM: mux_h2: Add missing braces in h2_snd_buf()around trace+wakeup
X-Git-Tag: v2.3.3~20
X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=6dca14490dffcd7aff69b71d3fefbf3b3dcf7c12;p=haproxy-2.3.git

BUG/MEDIUM: mux_h2: Add missing braces in h2_snd_buf()around trace+wakeup

This is a regression in 7838a79ba ("MEDIUM: mux-h2/trace: add lots of traces
all over the code"). The issue was found using -Wmisleading-indentation.
This patch fixes GitHub issue #1015.

The impact of this bug is that it could in theory cause occasional delays
on some long responses for connections having otherwise no traffic.

This patch should be backported to 2.1+, the commit was first tagged in
v2.1-dev2.

(cherry picked from commit 12a08d8849166ec0a779bbdee2ce9d768d5aa824)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
---

diff --git a/src/mux_h2.c b/src/mux_h2.c
index 03c15e5..12da9af 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -6143,9 +6143,10 @@ static size_t h2_snd_buf(struct conn_stream *cs, struct buffer *buf, size_t coun
 	htx_to_buf(htx, buf);
 
 	if (total > 0) {
-		if (!(h2s->h2c->wait_event.events & SUB_RETRY_SEND))
+		if (!(h2s->h2c->wait_event.events & SUB_RETRY_SEND)) {
 			TRACE_DEVEL("data queued, waking up h2c sender", H2_EV_H2S_SEND|H2_EV_H2C_SEND, h2s->h2c->conn, h2s);
 			tasklet_wakeup(h2s->h2c->wait_event.tasklet);
+		}
 
 	}
 	/* If we're waiting for flow control, and we got a shutr on the