mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Tim Duesterhus 2020-12-21 19:40:16 +01:00 committed by Willy Tarreau
parent 4d711760de
commit 12a08d8849
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mux_h2.c
View File

@ -6160,9 +6160,10 @@ static size_t h2_snd_buf(struct conn_stream *cs, struct buffer *buf, size_t coun
htx_to_buf(htx, buf); htx_to_buf(htx, buf);
if (total > 0) { 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); 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); tasklet_wakeup(h2s->h2c->wait_event.tasklet);
}
} }
/* If we're waiting for flow control, and we got a shutr on the /* If we're waiting for flow control, and we got a shutr on the