From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 22 Jul 2025 13:17:50 +0000 (+0200)
Subject: BUG/MINOR: httpclient-cli: Don't try to dump raw headers in HTX mode
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=094a542634ea4caf1844b208c4cf42d6c9a1acb6;p=thirdparty%2Fhaproxy.git

BUG/MINOR: httpclient-cli: Don't try to dump raw headers in HTX mode

In the CLI I/O handler interacting with the HTTP client, we must not try to
push raw headers in HTX mode, because there is no raw data in this
mode. This prevent the HTX dump at the end of the I/O handle.

It is a 3.3-specific issue. No backport needed.
---

diff --git a/src/httpclient_cli.c b/src/httpclient_cli.c
index 1b41c9214..1f96c8369 100644
--- a/src/httpclient_cli.c
+++ b/src/httpclient_cli.c
@@ -197,8 +197,8 @@ static int hc_cli_io_handler(struct appctx *appctx)
 	}
 
 	if (ctx->flags & HC_F_RES_HDR) {
-		chunk_reset(&trash);
 		if (!ctx->is_htx) {
+			chunk_reset(&trash);
 			hdrs = hc->res.hdrs;
 			for (hdr = hdrs; isttest(hdr->v); hdr++) {
 				if (!h1_format_htx_hdr(hdr->n, hdr->v, &trash))
@@ -206,9 +206,9 @@ static int hc_cli_io_handler(struct appctx *appctx)
 			}
 			if (!chunk_memcat(&trash, "\r\n", 2))
 				goto too_many_hdrs;
+			if (applet_putchk(appctx, &trash) == -1)
+				goto more;
 		}
-		if (applet_putchk(appctx, &trash) == -1)
-			goto more;
 		ctx->flags &= ~HC_F_RES_HDR;
 	}