From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 4 Oct 2022 06:58:02 +0000 (+0200)
Subject: BUG/MINOR: http-fetch: Update method after a prefetch in smp_fetch_meth()
X-Git-Tag: v2.7-dev8~66
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eefcd8a97de7d1b05b38d240b1061e2f2112f2f8;p=thirdparty%2Fhaproxy.git

BUG/MINOR: http-fetch: Update method after a prefetch in smp_fetch_meth()

In smp_fetch_meth(), smp_prefetch_htx() function may be called to parse the
HTX message and update the HTTP transaction accordingly. In this case, in
smp_fetch_metch() and on success, we must update "meth" variable. Otherwise,
the variable is still equal to HTTP_METH_OTHER and the string version is
always used instead of the enum for known methods.

This patch must be backported as far as 2.0.
---

diff --git a/src/http_fetch.c b/src/http_fetch.c
index ddfb2222d4..1579b4ede9 100644
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -346,6 +346,7 @@ static int smp_fetch_meth(const struct arg *args, struct sample *smp, const char
 		htx = smp_prefetch_htx(smp, chn, NULL, 1);
 		if (!htx)
 			return 0;
+		meth = txn->meth;
 	}
 
 	smp->data.type = SMP_T_METH;