From: Christopher Faulet <cfaulet@haproxy.com>
Date: Fri, 18 Sep 2026 11:21:39 +0000 (+0200)
Subject: MINOR: http-htx: Report the payload of RAW_DATA blocks in internal.htx_blk.data
X-Git-Tag: v3.5-dev8~141
X-Git-Url: https://git.kaiwu.me/?a=commitdiff_plain;h=13765c7accd949190e49e418ffad81d17b84ceb3;p=haproxy.git

MINOR: http-htx: Report the payload of RAW_DATA blocks in internal.htx_blk.data

The "internal.htx_blk.data" sample fetch only reported the payload of DATA
blocks. Because tunneled data are now stored in RAW_DATA blocks, and because
"internal.htx_blk.type" reports this new type, an empty string was returned
for such block while its type was properly displayed.

These sample fetches are debugging helpers. So both types are now handled,
htx_is_data_type() being used to test it.
---

diff --git a/src/http_htx.c b/src/http_htx.c
index c22545a11..4e887e281 100644
--- a/src/http_htx.c
+++ b/src/http_htx.c
@@ -3099,7 +3099,7 @@ smp_fetch_htx_blk_data(const struct arg *arg_p, struct sample *smp, const char *
 	else
 		blk = ((pos >= htx->head && pos <= htx->tail) ? htx_get_blk(htx, pos) : NULL);
 
-	if (!blk || htx_get_blk_type(blk) != HTX_BLK_DATA) {
+	if (!blk || !htx_is_data_type(htx_get_blk_type(blk))) {
 		smp->data.u.str.size = 0;
 		smp->data.u.str.area = "";
 		smp->data.u.str.data = 0;