mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: h1: Always try to receive more in h1_rcv_buf().

Browse Source 
In h1_rcv_buf(), wake the h1c tasklet as long as we're not done reading the
request/response, and the h1c is not already subscribed for receiving. Now
that we no longer subscribe in h1_recv() if we managed to read data, we
rely on h1_rcv_buf() calling us again, but h1_process_input() may have
returned 0 if we only received part of the request, so we have to wake
the tasklet to be sure to get more data again.
This commit is contained in:
Olivier Houchard 2019-08-22 18:34:25 +02:00 committed by Olivier Houchard
parent 78a7cb648c
commit 02bac85bee
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mux_h1.c
View File

@ -2426,7 +2426,7 @@ static size_t h1_rcv_buf(struct conn_stream *cs, struct buffer *buf, size_t coun
if (h1m->state != H1_MSG_TUNNEL || (h1m->state == H1_MSG_DATA && h1m->curr_len)) if (h1m->state != H1_MSG_TUNNEL || (h1m->state == H1_MSG_DATA && h1m->curr_len))
h1s->flags |= H1S_F_BUF_FLUSH; h1s->flags |= H1S_F_BUF_FLUSH;
} }
else if (ret > 0 || (h1s->flags & H1S_F_SPLICED_DATA)) { else {
h1s->flags &= ~H1S_F_SPLICED_DATA; h1s->flags &= ~H1S_F_SPLICED_DATA;
if (h1m->state != H1_MSG_DONE && if (h1m->state != H1_MSG_DONE &&
!(h1c->wait_event.events & SUB_RETRY_RECV)) !(h1c->wait_event.events & SUB_RETRY_RECV))