From: Willy Tarreau <w@1wt.eu>
Date: Mon, 30 Oct 2017 14:44:59 +0000 (+0100)
Subject: MEDIUM: h2: unblock a connection when its current stream detaches
X-Git-Tag: v1.8-rc1~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45f752e037b15fcd07d4620fbc39b8b192fa0bda;p=thirdparty%2Fhaproxy.git

MEDIUM: h2: unblock a connection when its current stream detaches

If a stream is killed for whatever reason and it happens to be the one
currently blocking the connection, we must unblock the connection and
enable polling again so that it can attempt to make progress. This may
happen for example on upload timeout, where the demux is blocked due to
a full stream buffer, and the stream dies on server timeout and quits.
---

diff --git a/src/mux_h2.c b/src/mux_h2.c
index 3b26a01eb6..b793c52db0 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -1628,6 +1628,17 @@ static void h2_detach(struct conn_stream *cs)
 	h2c = h2s->h2c;
 	h2s->cs = NULL;
 
+	if ((h2c->flags & H2_CF_DEM_BLOCK_ANY && h2s->id == h2c->dsi) ||
+	    (h2c->flags & H2_CF_MUX_BLOCK_ANY && h2s->id == h2c->msi)) {
+		/* unblock the connection if it was blocked on this
+		 * stream.
+		 */
+		h2c->flags &= ~H2_CF_DEM_BLOCK_ANY;
+		h2c->flags &= ~H2_CF_MUX_BLOCK_ANY;
+		conn_xprt_want_recv(cs->conn);
+		conn_xprt_want_send(cs->conn);
+	}
+
 	if (h2s->by_id.node.leaf_p) {
 		/* h2s still attached to the h2c */
 		eb32_delete(&h2s->by_id);