From: Willy Tarreau <w@1wt.eu>
Date: Thu, 3 Jan 2019 17:41:05 +0000 (+0100)
Subject: MEDIUM: mux-h2: pass trailers to HTX
X-Git-Tag: v2.0-dev1~276
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5255f283f62e94b79f2762c642897047c12729e2;p=thirdparty%2Fhaproxy.git

MEDIUM: mux-h2: pass trailers to HTX

When receiving an H2 message in HTX mode, trailers present in chunked
messages are now properly appended to the HTX block.
---

diff --git a/src/mux_h2.c b/src/mux_h2.c
index 74c6c0a2e0..e192cb3926 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -3460,9 +3460,8 @@ next_frame:
 	if (htx) {
 		if (!htx_add_endof(htx, HTX_BLK_EOD))
 			goto fail;
-		/* FIXME: emit the decoded trailers here. EOM will be sent
-		 * when leaving.
-		 */
+		if (h2_make_htx_trailers(list, htx) <= 0)
+			goto fail;
 	}
 	else if (*flags & H2_SF_DATA_CHNK) {
 		/* Legacy mode with chunked encoding : we must finalize the