upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-21 14:17:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

BUG/MEDIUM: H2: Make sure htx is set even on empty frames.

Browse source 
When transfering data, make sure htx is set even on empty frames, or we
will never add a HTX_BLK_EOM block.
This commit is contained in:
Olivier Houchard 2018-12-19 15:53:53 +01:00 committed by Willy Tarreau
parent d2e88c715d
commit 2f30883793
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mux_h2.c
View file

@ -3260,6 +3260,8 @@ static int h2_frt_transfer_data(struct h2s *h2s)
try_again:
flen = h2c->dfl - h2c->dpl;
if (h2c->proxy->options2 & PR_O2_USE_HTX)
htx = htx_from_buf(csbuf);
if (!flen)
goto end_transfer;
@ -3270,7 +3272,6 @@ try_again:
}
if (h2c->proxy->options2 & PR_O2_USE_HTX) {
htx = htx_from_buf(csbuf);
block1 = htx_free_data_space(htx);
if (!block1) {
h2c->flags |= H2_CF_DEM_SFULL;