From: Olivier Houchard <ohouchard@haproxy.com>
Date: Thu, 6 Dec 2018 16:41:26 +0000 (+0100)
Subject: BUG/MEDIUM: h1: Set CS_FL_REOS if we had a read0.
X-Git-Tag: v1.9-dev10~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a2d33481;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: h1: Set CS_FL_REOS if we had a read0.

In h1_recv(), if we get a read0, let the conn_stream know by setting the
CS_FL_REOS flag, or it may never be aware we did hit EOS.

This should not be backported.
---

diff --git a/src/mux_h1.c b/src/mux_h1.c
index c3293409dc..c2d00303ef 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -1587,6 +1587,8 @@ static int h1_recv(struct h1c *h1c)
 		h1s->recv_wait = NULL;
 
 	}
+	if (conn_xprt_read0_pending(conn))
+		h1s->cs->flags |= CS_FL_REOS;
 	if (!b_data(&h1c->ibuf))
 		h1_release_buf(h1c, &h1c->ibuf);
 	else if (!buf_room_for_htx_data(&h1c->ibuf))