mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-10-27 14:41:28 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: mux-h2: Set known input payload length of the sedesc

Browse Source 
Set <kip> value when data are transfer to the upper layer, in h2_rcv_buf().
The new <body_len> filed of the H2S is used to increment <kip> value and
then it is reset. The patch relies on the previous one ("MINOR: mux-h2: Save
the known length of the payload").
This commit is contained in:
Christopher Faulet 2025-09-18 08:41:37 +02:00
parent 3a6a576e73
commit bc8c6c42f4
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mux_h2.c
View File

@ -3550,6 +3550,8 @@ static struct h2s *h2c_frt_handle_headers(struct h2c *h2c, struct h2s *h2s)
h2s->st = H2_SS_OPEN; h2s->st = H2_SS_OPEN;
h2s->flags |= flags; h2s->flags |= flags;
h2s->body_len = body_len; h2s->body_len = body_len;
if (h2s->flags & H2_SF_DATA_CLEN)
h2s->sd->kip = h2s->body_len;
h2s_propagate_term_flags(h2c, h2s); h2s_propagate_term_flags(h2c, h2s);
done: done:
@ -3685,6 +3687,9 @@ static struct h2s *h2c_bck_handle_headers(struct h2c *h2c, struct h2s *h2s)
goto fail; goto fail;
} }
if (h2s->flags & H2_SF_DATA_CLEN)
h2s->sd->kip = h2s->body_len;
if (se_fl_test(h2s->sd, SE_FL_ERROR) && h2s->st < H2_SS_ERROR) if (se_fl_test(h2s->sd, SE_FL_ERROR) && h2s->st < H2_SS_ERROR)
h2s->st = H2_SS_ERROR; h2s->st = H2_SS_ERROR;
else if (h2s->flags & H2_SF_ES_RCVD) { else if (h2s->flags & H2_SF_ES_RCVD) {
@ -7711,6 +7716,7 @@ static size_t h2_rcv_buf(struct stconn *sc, struct buffer *buf, size_t count, in
struct htx_ret htxret; struct htx_ret htxret;
size_t ret = 0; size_t ret = 0;
uint prev_h2c_flags = h2c->flags; uint prev_h2c_flags = h2c->flags;
unsigned long long prev_body_len = h2s->body_len;
TRACE_ENTER(H2_EV_STRM_RECV, h2c->conn, h2s); TRACE_ENTER(H2_EV_STRM_RECV, h2c->conn, h2s);
@ -7760,6 +7766,10 @@ static size_t h2_rcv_buf(struct stconn *sc, struct buffer *buf, size_t count, in
ret -= h2s_htx->data; ret -= h2s_htx->data;
end: end:
/* If ther is no content-length, take care to update <kip> field */
if (!(h2s->flags & H2_SF_DATA_CLEN))
h2s->sd->kip += prev_body_len - h2s->body_len;
/* release the rxbuf if it's not used anymore */ /* release the rxbuf if it's not used anymore */
if (rxbuf && !b_data(rxbuf) && b_size(rxbuf)) { if (rxbuf && !b_data(rxbuf) && b_size(rxbuf)) {
BUG_ON_HOT(rxbuf != _h2s_rxbuf_head(h2s)); BUG_ON_HOT(rxbuf != _h2s_rxbuf_head(h2s));