From 56b0348ea7a31792ade70c4759889895b6d24d38 Mon Sep 17 00:00:00 2001 From: Olivier Houchard Date: Mon, 10 Dec 2018 16:09:53 +0100 Subject: [PATCH] BUG/MEDIUM: mux-h2: Don't forget to set the CS_FL_EOS flag with htx. When running with HTX, if we got an empty answer, don't forget to set CS_FL_EOS, or the stream will never be destroyed. --- src/mux_h2.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mux_h2.c b/src/mux_h2.c index c83230a35..f16da22c8 100644 --- a/src/mux_h2.c +++ b/src/mux_h2.c @@ -4488,8 +4488,11 @@ static size_t h2_rcv_buf(struct conn_stream *cs, struct buffer *buf, size_t coun if (h2c->proxy->options2 & PR_O2_USE_HTX) { /* in HTX mode we ignore the count argument */ h2s_htx = htx_from_buf(&h2s->rxbuf); - if (htx_is_empty(h2s_htx)) + if (htx_is_empty(h2s_htx)) { + if (cs->flags & CS_FL_REOS) + cs->flags |= CS_FL_EOS; goto end; + } buf_htx = htx_from_buf(buf); count = htx_free_space(buf_htx);