From: Olivier Houchard Date: Fri, 17 May 2019 13:38:29 +0000 (+0200) Subject: BUG/MEDIUM: streams: Don't use CF_EOI to decide if the request is complete. X-Git-Tag: v2.0-dev4~75 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce1a0292bf718bd963af4fec1bc9cc6fba432d51;p=thirdparty%2Fhaproxy.git BUG/MEDIUM: streams: Don't use CF_EOI to decide if the request is complete. In si_cs_send(), don't check CF_EOI on the request channel to decide if the request is complete and if we should save the buffer to eventually attempt L7 retries. The flag may not be set yet, and it may too be set to early, before we're done modifying the buffer. Instead, get the msg, and make sure its state is HTTP_MSG_DONE. That way we will store the request buffer when sending it even in H2. --- diff --git a/src/stream_interface.c b/src/stream_interface.c index 731df38a5d..3b9c707770 100644 --- a/src/stream_interface.c +++ b/src/stream_interface.c @@ -688,6 +688,7 @@ int si_cs_send(struct conn_stream *cs) send_flag |= CO_SFL_STREAMER; if ((si->flags & SI_FL_L7_RETRY) && !b_data(&si->l7_buffer)) { + struct stream *s = si_strm(si); /* If we want to be able to do L7 retries, copy * the data we're about to send, so that we are able * to resend them if needed @@ -697,7 +698,7 @@ int si_cs_send(struct conn_stream *cs) * disable the l7 retries by setting * l7_conn_retries to 0. */ - if (!(oc->flags & CF_EOI)) + if (!s->txn || (s->txn->req.msg_state != HTTP_MSG_DONE)) si->flags &= ~SI_FL_L7_RETRY; else { if (b_is_null(&si->l7_buffer))