]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MEDIUM: h1: Set CS_FL_REOS if we had a read0.
authorOlivier Houchard <ohouchard@haproxy.com>
Thu, 6 Dec 2018 16:41:26 +0000 (17:41 +0100)
committerWilly Tarreau <w@1wt.eu>
Thu, 6 Dec 2018 18:08:44 +0000 (19:08 +0100)
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.

src/mux_h1.c

index c3293409dcc0aac55364355579d3710dbea9af25..c2d00303ef5752ab8ddba311396246c5504b53b0 100644 (file)
@@ -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))