upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-15 21:59:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

MINOR: mux-h1: Set CS_FL_EOI the end of the message is reached

Browse source 
As for the H2 multiplexer, When the end of a message is detected, the flag
CS_FL_EOI is set on the conn_stream.

This patch should be backported to 1.9.
This commit is contained in:
Christopher Faulet 2019-03-22 14:09:41 +01:00 committed by Willy Tarreau
parent 63768a63d7
commit dbe2cb4ee5
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/mux_h1.c
View file

@ -1033,9 +1033,11 @@ static size_t h1_process_headers(struct h1s *h1s, struct h1m *h1m, struct htx *h
sl->info.res.status = h1s->status;
}
if (h1m->state == H1_MSG_DONE)
if (h1m->state == H1_MSG_DONE) {
if (!htx_add_endof(htx, HTX_BLK_EOM))
goto error;
h1s->cs->flags |= CS_FL_EOI;
}
h1_process_conn_mode(h1s, h1m, htx, NULL);
@ -1130,6 +1132,7 @@ static size_t h1_process_data(struct h1s *h1s, struct h1m *h1m, struct htx *htx,
if (!htx_add_endof(htx, HTX_BLK_EOM))
goto end;
h1m->state = H1_MSG_DONE;
h1s->cs->flags |= CS_FL_EOI;
}
}
else if (h1m->flags & H1_MF_CHNK) {
@ -1228,6 +1231,7 @@ static size_t h1_process_data(struct h1s *h1s, struct h1m *h1m, struct htx *htx,
if (!htx_add_endof(htx, HTX_BLK_EOM))
goto end;
h1m->state = H1_MSG_DONE;
h1s->cs->flags |= CS_FL_EOI;
}
}
else {
@ -1237,6 +1241,7 @@ static size_t h1_process_data(struct h1s *h1s, struct h1m *h1m, struct htx *htx,
if (!htx_add_endof(htx, HTX_BLK_EOM))
goto end;
h1m->state = H1_MSG_DONE;
h1s->cs->flags |= CS_FL_EOI;
}
}
else {