From: Olivier Houchard <ohouchard@haproxy.com>
Date: Wed, 12 Sep 2018 15:56:08 +0000 (+0200)
Subject: BUG/MEDIUM: h2: Don't forget to set recv_wait_list to NULL in h2_detach.
X-Git-Tag: v1.9-dev2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70d0d18d41ac90f7947d0da1e716d6d706ca3d63;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: h2: Don't forget to set recv_wait_list to NULL in h2_detach.

If we're detaching the conn_stream, and it was subscribed to be waken up
when more data was available to receive, unsubscribe it.

No backport is needed.
---

diff --git a/src/mux_h2.c b/src/mux_h2.c
index 4a2d864e4e..53364356b6 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -2606,6 +2606,9 @@ static void h2_detach(struct conn_stream *cs)
 		return;
 
 	h2c = h2s->h2c;
+	/* If the stream we're detaching waited for more data, unsubscribe it now */
+	if (h2s->recv_wait_list && !((long)h2s->recv_wait_list->handle & 3))
+		h2s->recv_wait_list = NULL;
 	h2s->cs = NULL;
 	h2c->nb_cs--;
 	if (h2c->flags & H2_CF_DEM_TOOMANY &&