From: Olivier Houchard <ohouchard@haproxy.com>
Date: Wed, 19 Dec 2018 14:53:53 +0000 (+0100)
Subject: BUG/MEDIUM: H2: Make sure htx is set even on empty frames.
X-Git-Tag: v1.9.0~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f30883793ff4e4a6ba84949bf0bd61171f4979b;p=thirdparty%2Fhaproxy.git

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.
---

diff --git a/src/mux_h2.c b/src/mux_h2.c
index cec3576e29..fa7b26f23d 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -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;