mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-23 06:41:32 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: streams: Don't use CF_EOI to decide if the request is complete.

Browse Source 
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.
This commit is contained in:
Olivier Houchard 2019-05-17 15:38:29 +02:00 committed by Olivier Houchard
parent 4e2b646d60
commit ce1a0292bf
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/stream_interface.c
View File

@ -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))