From 5255f283f62e94b79f2762c642897047c12729e2 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Thu, 3 Jan 2019 18:41:05 +0100 Subject: [PATCH] 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. --- src/mux_h2.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mux_h2.c b/src/mux_h2.c index 74c6c0a2e..e192cb392 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