From d7739c8820be1d7a89498f6d01cd652f7548b583 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Mon, 30 Oct 2017 15:38:23 +0100 Subject: [PATCH] MEDIUM: h2: enable reading again on the connection if it was blocked on stream buffer full If the polling update function is called with RD_ENA while H2_CF_DEM_SFULL indicates the demux had to block on a stream buffer full condition, we can remove the flag and re-enable polling for receiving because this is the indication that a consumer stream has made some room in the buffer. Probably that we should improve this to ensure that h2s->id == h2c->dsi and avoid trying to receive multiple times in a row for the wrong stream. --- src/mux_h2.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/mux_h2.c b/src/mux_h2.c index f05c26939..e9f1bc856 100644 --- a/src/mux_h2.c +++ b/src/mux_h2.c @@ -943,6 +943,14 @@ static void h2_update_poll(struct conn_stream *cs) if (!h2s) return; + /* we may unblock a blocked read */ + + if (cs->flags & CS_FL_DATA_RD_ENA && + h2s->h2c->flags & H2_CF_DEM_SFULL && h2s->h2c->dsi == h2s->id) { + h2s->h2c->flags &= ~H2_CF_DEM_SFULL; + conn_xprt_want_recv(cs->conn); + } + /* Note: the stream and stream-int code doesn't allow us to perform a * synchronous send() here unfortunately, because this code is called * as si_update() from the process_stream() context. This means that