mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 20:46:11 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: mux-h1: Properly report when mux is blocked during a nego

Browse Source 
During a zero-copy forwarding negociation, if the H1 mux is blocked for any
reason, the IOBUF_FL_FF_BLOCKED flag must be set on its iobuf to notfiy the
producer it must wait. However, there were two places where it was not
performed: when the output buffer allocation failed and when the chunk
formatting failed.

This patch fixes the issue. It must be backported to 2.9.
This commit is contained in:
Christopher Faulet 2024-02-28 14:46:56 +01:00
parent 489e583ac5
commit 81f75d32b2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mux_h1.c
View File

@ -4487,8 +4487,10 @@ static size_t h1_nego_ff(struct stconn *sc, struct buffer *input, size_t count,
else {
BUG_ON(h1m->state != H1_MSG_CHUNK_CRLF && h1m->state != H1_MSG_CHUNK_SIZE);
if (flags & NEGO_FF_FL_EXACT_SIZE) {
if (!h1_make_chunk(h1s, h1m, count))
if (!h1_make_chunk(h1s, h1m, count)) {
h1s->sd->iobuf.flags |= IOBUF_FL_FF_BLOCKED;
goto out;
}
h1m->curr_len = count;
}
else {
@ -4531,6 +4533,7 @@ static size_t h1_nego_ff(struct stconn *sc, struct buffer *input, size_t count,
no_splicing:
if (!h1_get_buf(h1c, &h1c->obuf)) {
h1c->flags |= H1C_F_OUT_ALLOC;
h1s->sd->iobuf.flags |= IOBUF_FL_FF_BLOCKED;
TRACE_STATE("waiting for opposite h1c obuf allocation", H1_EV_STRM_SEND|H1_EV_H1S_BLK, h1c->conn, h1s);
goto out;
}