RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: mux-h1: Don't set CS_FL_EOI too early for protocol upgrade requests 

When a protocol upgrade request is received, once parsed, it is waiting for
the response in the DONE state. But we must not set the flag CS_FL_EOI
because we don't know if a protocol upgrade will be performed or not.

Now, it is set on the response path, if both sides reached the DONE
state. If a protocol upgrade is finally performed, both side are switched in
TUNNEL state. Thus the CS_FL_EOI flag is not set.

If backported, this patch must be adapted because for now it relies on last
2.4-dev changes. It may be backported as far as 2.0.
This commit is contained in:
Christopher Faulet 2020-12-07 18:21:27 +01:00
parent c75668ebff
commit 3e1748bbf3
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mux_h1.c
View File

@ -1568,7 +1568,10 @@ static size_t h1_process_input(struct h1c *h1c, struct buffer *buf, size_t count
h1s->cs->flags &= ~CS_FL_MAY_SPLICE;
}
if (h1s->flags & H1S_F_PARSING_DONE)
/* Don't set EOI on the conn-stream for protocol upgrade requests, wait
* the response to do so or not depending on the status code.
*/
if ((h1s->flags & H1S_F_PARSING_DONE) && !(h1m->flags & H1_MF_CONN_UPG))
h1s->cs->flags |= CS_FL_EOI;
if (h1s_data_pending(h1s) && !htx_is_empty(htx))
@ -1577,8 +1580,10 @@ static size_t h1_process_input(struct h1c *h1c, struct buffer *buf, size_t count
h1s->cs->flags &= ~(CS_FL_RCV_MORE | CS_FL_WANT_ROOM);
if (h1s->flags & H1S_F_REOS) {
h1s->cs->flags |= CS_FL_EOS;
if (h1m->state == H1_MSG_TUNNEL)
if (h1m->state >= H1_MSG_DONE) {
/* DONE or TUNNEL, set EOI on the conn-stream */
h1s->cs->flags |= CS_FL_EOI;
}
else if (h1m->state > H1_MSG_LAST_LF && h1m->state < H1_MSG_DONE)
h1s->cs->flags |= CS_FL_ERROR;
}
@ -2023,6 +2028,13 @@ static size_t h1_process_output(struct h1c *h1c, struct buffer *buf, size_t coun
htx_to_buf(chn_htx, buf);
out:
/* Both the request and the response reached the DONE state. So set EOI
* flag on the conn-stream. Most of time, the flag will already be set,
* except for protocol upgrades.
*/
if (h1s->cs && h1s->req.state == H1_MSG_DONE && h1s->res.state == H1_MSG_DONE)
h1s->cs->flags |= CS_FL_EOI;
if (!buf_room_for_htx_data(&h1c->obuf)) {
TRACE_STATE("h1c obuf full", H1_EV_TX_DATA|H1_EV_H1S_BLK, h1c->conn, h1s);
h1c->flags |= H1C_F_OUT_FULL;