commit 2f30883793ff4e4a6ba84949bf0bd61171f4979b
author Olivier Houchard <ohouchard@haproxy.com> Wed Dec 19 15:53:53 2018 +0100
committer Willy Tarreau <w@1wt.eu> Wed Dec 19 17:00:14 2018 +0100
tree 58a82b7231562bac829201b9853a7e095e375ebd
parent d2e88c715d4880ef87f1f7dc4f851656937c6d75

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

When transfering data, make sure htx is set even on empty frames, or we
will never add a HTX_BLK_EOM block.

src/mux_h2.c

diff --git a/src/mux_h2.c b/src/mux_h2.c
index cec3576..fa7b26f 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -3260,6 +3260,8 @@
 
 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 @@
 	}
 
 	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;