mirror of
https://github.com/haproxy/haproxy.git
synced 2026-06-09 00:32:33 -04:00
MEDIUM: mux-h2: Stop dealing with HTX flags transfer in h2_rcv_buf()
In h2_rcv_buf(), HTX flags are transfer with data when htx_xfer() is called. There is no reason to continue to deal with them in the H2 mux. In addition, there is no reason to set SE_FL_EOI flag when a parsing error was reported. This part was added before the stconn era. Nowadays, when an HTX parsing error is reported, an error on the sedesc should also be reported.
This commit is contained in:
parent
d257dd4563
commit
cd363e0246
1 changed files with 0 additions and 9 deletions
|
|
@ -7902,15 +7902,6 @@ static size_t h2_rcv_buf(struct stconn *sc, struct buffer *buf, size_t count, in
|
|||
|
||||
count -= htx_xfer(buf_htx, h2s_htx, count, HTX_XFER_DEFAULT);
|
||||
|
||||
if (h2s_htx->flags & HTX_FL_PARSING_ERROR) {
|
||||
buf_htx->flags |= HTX_FL_PARSING_ERROR;
|
||||
if (htx_is_empty(buf_htx))
|
||||
se_fl_set(h2s->sd, SE_FL_EOI);
|
||||
}
|
||||
else if (htx_is_empty(h2s_htx)) {
|
||||
buf_htx->flags |= (h2s_htx->flags & HTX_FL_EOM);
|
||||
}
|
||||
|
||||
htx_to_buf(buf_htx, buf);
|
||||
htx_to_buf(h2s_htx, rxbuf);
|
||||
ret -= h2s_htx->data;
|
||||
|
|
|
|||
Loading…
Reference in a new issue