From: Christopher Faulet <cfaulet@haproxy.com>
Date: Thu, 24 Oct 2019 08:31:01 +0000 (+0200)
Subject: BUG/MINOR: mux-h2: Don't pretend mux buffers aren't full anymore if nothing sent
X-Git-Tag: v2.1-dev4~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69fe5cea213afd0c7465094e9dfead93143dcf3f;p=thirdparty%2Fhaproxy.git

BUG/MINOR: mux-h2: Don't pretend mux buffers aren't full anymore if nothing sent

In h2_send(), when something is sent, we remove the flags
(H2_CF_MUX_MFULL|H2_CF_DEM_MROOM) on the h2 connection. This way, we are able to
wake up all streams waiting to send data. Unfortunatly, these flags are
unconditionally removed, even when nothing was sent. So if the h2c is blocked
because the mux buffers are full and we are unable to send anything, all streams
in the send_list are woken up for nothing. Now, we only remove these flags if at
least a send succeeds.

This patch must be backport to 2.0.
---

diff --git a/src/mux_h2.c b/src/mux_h2.c
index aeb91668b9..bb0a94de40 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -3488,7 +3488,8 @@ static int h2_send(struct h2c *h2c)
 			offer_buffers(NULL, tasks_run_queue);
 
 		/* wrote at least one byte, the buffer is not full anymore */
-		h2c->flags &= ~(H2_CF_MUX_MFULL | H2_CF_DEM_MROOM);
+		if (sent)
+			h2c->flags &= ~(H2_CF_MUX_MFULL | H2_CF_DEM_MROOM);
 	}
 
 	if (conn->flags & CO_FL_SOCK_WR_SH) {