RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-22 13:46:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: mux-h2: Don't mix the end of the message with the end of stream

Browse Source 
The H2 multiplexer now sets CS_FL_EOI when it receives a frame with the ES
flag. And when the H2 streams is closed, it set the flag CS_FL_REOS.

This patch should be backported to 1.9.
This commit is contained in:
Christopher Faulet 2019-03-22 14:05:52 +01:00 committed by Willy Tarreau
parent 297d3e2e0f
commit 63768a63d7
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mux_h2.c
View File

@ -841,6 +841,8 @@ static inline void h2s_close(struct h2s *h2s)
h2s->h2c->nb_streams--; h2s->h2c->nb_streams--;
if (!h2s->id) if (!h2s->id)
h2s->h2c->nb_reserved--; h2s->h2c->nb_reserved--;
if (h2s->cs)
h2s->cs->flags |= CS_FL_REOS;
} }
h2s->st = H2_SS_CLOSED; h2s->st = H2_SS_CLOSED;
} }
@ -1423,9 +1425,9 @@ static void h2s_wake_one_stream(struct h2s *h2s, uint32_t flags)
if (flags & CS_FL_ERR_PENDING && h2s->st < H2_SS_ERROR) if (flags & CS_FL_ERR_PENDING && h2s->st < H2_SS_ERROR)
h2s->st = H2_SS_ERROR; h2s->st = H2_SS_ERROR;
else if (flags & CS_FL_REOS && h2s->st == H2_SS_OPEN) else if ((flags & (CS_FL_EOI|CS_FL_REOS)) && h2s->st == H2_SS_OPEN)
h2s->st = H2_SS_HREM; h2s->st = H2_SS_HREM;
else if (flags & CS_FL_REOS && h2s->st == H2_SS_HLOC) else if ((flags & (CS_FL_EOI|CS_FL_REOS)) && h2s->st == H2_SS_HLOC)
h2s_close(h2s); h2s_close(h2s);
} }
@ -1970,12 +1972,12 @@ static struct h2s *h2c_frt_handle_headers(struct h2c *h2c, struct h2s *h2s)
h2s->flags |= H2_SF_ES_RCVD; h2s->flags |= H2_SF_ES_RCVD;
if (h2s->flags & H2_SF_ES_RCVD) { if (h2s->flags & H2_SF_ES_RCVD) {
if (h2s->cs)
h2s->cs->flags |= CS_FL_EOI;
if (h2s->st == H2_SS_OPEN) if (h2s->st == H2_SS_OPEN)
h2s->st = H2_SS_HREM; h2s->st = H2_SS_HREM;
else else
h2s_close(h2s); h2s_close(h2s);
if (h2s->cs)
h2s->cs->flags |= CS_FL_REOS;
} }
/* update the max stream ID if the request is being processed */ /* update the max stream ID if the request is being processed */
@ -2043,14 +2045,14 @@ static struct h2s *h2c_bck_handle_headers(struct h2c *h2c, struct h2s *h2s)
if (h2c->dff & H2_F_HEADERS_END_STREAM) { if (h2c->dff & H2_F_HEADERS_END_STREAM) {
h2s->flags |= H2_SF_ES_RCVD; h2s->flags |= H2_SF_ES_RCVD;
if (h2s->cs) if (h2s->cs)
h2s->cs->flags |= CS_FL_REOS; h2s->cs->flags |= CS_FL_EOI;
} }
if (h2s->cs && h2s->cs->flags & CS_FL_ERROR && h2s->st < H2_SS_ERROR) if (h2s->cs && h2s->cs->flags & CS_FL_ERROR && h2s->st < H2_SS_ERROR)
h2s->st = H2_SS_ERROR; h2s->st = H2_SS_ERROR;
else if (h2s->cs && h2s->cs->flags & CS_FL_REOS && h2s->st == H2_SS_OPEN) else if (h2s->cs && (h2s->cs->flags & (CS_FL_EOI|CS_FL_REOS)) && h2s->st == H2_SS_OPEN)
h2s->st = H2_SS_HREM; h2s->st = H2_SS_HREM;
else if ((!h2s || h2s->cs->flags & CS_FL_REOS) && h2s->st == H2_SS_HLOC) else if ((!h2s || h2s->cs->flags & (CS_FL_EOI|CS_FL_REOS)) && h2s->st == H2_SS_HLOC)
h2s_close(h2s); h2s_close(h2s);
return h2s; return h2s;
@ -2114,14 +2116,14 @@ static int h2c_frt_handle_data(struct h2c *h2c, struct h2s *h2s)
/* last frame */ /* last frame */
if (h2c->dff & H2_F_DATA_END_STREAM) { if (h2c->dff & H2_F_DATA_END_STREAM) {
if (h2s->cs)
h2s->cs->flags |= CS_FL_EOI;
if (h2s->st == H2_SS_OPEN) if (h2s->st == H2_SS_OPEN)
h2s->st = H2_SS_HREM; h2s->st = H2_SS_HREM;
else else
h2s_close(h2s); h2s_close(h2s);
h2s->flags |= H2_SF_ES_RCVD; h2s->flags |= H2_SF_ES_RCVD;
if (h2s->cs)
h2s->cs->flags |= CS_FL_REOS;
if (h2s->flags & H2_SF_DATA_CLEN && h2s->body_len) { if (h2s->flags & H2_SF_DATA_CLEN && h2s->body_len) {
/* RFC7540#8.1.2 */ /* RFC7540#8.1.2 */
@ -2282,7 +2284,7 @@ static void h2_process_demux(struct h2c *h2c)
if (tmp_h2s != h2s && h2s && h2s->cs && if (tmp_h2s != h2s && h2s && h2s->cs &&
(b_data(&h2s->rxbuf) || (b_data(&h2s->rxbuf) ||
(h2s->cs->flags & (CS_FL_ERROR|CS_FL_ERR_PENDING|CS_FL_EOS|CS_FL_REOS)))) { (h2s->cs->flags & (CS_FL_ERROR|CS_FL_ERR_PENDING|CS_FL_EOS|CS_FL_REOS|CS_FL_EOI)))) {
/* we may have to signal the upper layers */ /* we may have to signal the upper layers */
h2s->cs->flags |= CS_FL_RCV_MORE; h2s->cs->flags |= CS_FL_RCV_MORE;
h2s_notify_recv(h2s); h2s_notify_recv(h2s);
@ -2519,7 +2521,7 @@ static void h2_process_demux(struct h2c *h2c)
/* we can go here on missing data, blocked response or error */ /* we can go here on missing data, blocked response or error */
if (h2s && h2s->cs && if (h2s && h2s->cs &&
(b_data(&h2s->rxbuf) || (b_data(&h2s->rxbuf) ||
(h2s->cs->flags & (CS_FL_ERROR|CS_FL_ERR_PENDING|CS_FL_EOS|CS_FL_REOS)))) { (h2s->cs->flags & (CS_FL_ERROR|CS_FL_ERR_PENDING|CS_FL_EOS|CS_FL_REOS|CS_FL_EOI)))) {
/* we may have to signal the upper layers */ /* we may have to signal the upper layers */
h2s->cs->flags |= CS_FL_RCV_MORE; h2s->cs->flags |= CS_FL_RCV_MORE;
h2s_notify_recv(h2s); h2s_notify_recv(h2s);