From: Christopher Faulet <cfaulet@haproxy.com>
Date: Wed, 21 Nov 2018 12:51:07 +0000 (+0100)
Subject: MINOR: stats: Don't add end-of-data marker and trailers in the HTX response
X-Git-Tag: v1.9-dev9~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1b0821e8e935902e1b0360b4022ad107d378c4d;p=thirdparty%2Fhaproxy.git

MINOR: stats: Don't add end-of-data marker and trailers in the HTX response

Because the mux H1 is able to handle these blocks by itself, it is easier to
ignore them in the stats applet.
---

diff --git a/src/stats.c b/src/stats.c
index d0544a3363..c0de42961b 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -3221,18 +3221,7 @@ static void htx_stats_io_handler(struct appctx *appctx)
 	if (appctx->st0 == STAT_HTTP_DONE) {
 		struct htx_blk *blk;
 
-		if (appctx->ctx.stats.flags & STAT_CHUNKED) {
-			// FIXME: if trailers failed, do not add EOD twice
-			if (!htx_add_endof(res_htx, HTX_BLK_EOD)) {
-				si_rx_room_blk(si);
-				goto out;
-			}
-			if (!htx_add_trailer(res_htx, ist("\r\n"))) {
-				si_rx_room_blk(si);
-				goto out;
-			}
-			appctx->ctx.stats.flags &= ~STAT_CHUNKED;
-		}
+		/* Don't add EOD and TLR because mux-h1 will take care of it */
 		if (!htx_add_endof(res_htx, HTX_BLK_EOM)) {
 			si_rx_room_blk(si);
 			goto out;