summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Faulet <cfaulet@haproxy.com>2023-02-28 18:44:14 +0100
committerChristopher Faulet <cfaulet@haproxy.com>2023-02-28 18:44:15 +0100
commit0506d9de512291ed2526654800b98a2317a67b6d (patch)
tree15a5def198bf59d570edad6d3dec492627166c6a
parentfb5fff19fee40c660f9839f3bb0b40f33d4899e7 (diff)
downloadhaproxy-0506d9de512291ed2526654800b98a2317a67b6d.tar.gz
BUG/MINOR: http-check: Don't set HTX_SL_F_BODYLESS flag with a log-format body
When the HTTP request of a health-check is forged, we must not pretend there is no payload, by setting HTX_SL_F_BODYLESS, if a log-format body was configured. Indeed, a test on the body length was used but it is only valid for a plain string. For A log-format string, a list is used. Note it an bug with no consequence for now. This patch must be backported as far as 2.2.
-rw-r--r--src/tcpcheck.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tcpcheck.c b/src/tcpcheck.c
index bfe3a2c63..07d16aa5d 100644
--- a/src/tcpcheck.c
+++ b/src/tcpcheck.c
@@ -1412,7 +1412,7 @@ enum tcpcheck_eval_ret tcpcheck_eval_send(struct check *check, struct tcpcheck_r
(istlen(vsn) == 8 && (*(vsn.ptr+5) > '1' || (*(vsn.ptr+5) == '1' && *(vsn.ptr+7) >= '1'))))
slflags |= HTX_SL_F_VER_11;
slflags |= (HTX_SL_F_XFER_LEN|HTX_SL_F_CLEN);
- if (!isttest(send->http.body))
+ if (!(send->http.flags & TCPCHK_SND_HTTP_FL_BODY_FMT) && !isttest(send->http.body))
slflags |= HTX_SL_F_BODYLESS;
htx = htx_from_buf(&check->bo);