From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 5 May 2020 09:53:43 +0000 (+0200)
Subject: BUG/MINOR: 51d: Fix HTX message prefetch
X-Git-Tag: v2.2-dev7~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f11b1fb87fd94896aa7dbf69a57b023e4ceb952c;p=thirdparty%2Fhaproxy.git

BUG/MINOR: 51d: Fix HTX message prefetch

An additional argument has been added to smp_prefetch_htx() function in the
commit 778f5ed47 ("MEDIUM: checks/http-fetch: Support htx prefetch from a check
for HTTP samples"). But forgot to update call in 51d module.

No need to backport.
---

diff --git a/src/51d.c b/src/51d.c
index 42d1929679..78ee7483bd 100644
--- a/src/51d.c
+++ b/src/51d.c
@@ -238,7 +238,7 @@ static void _51d_set_headers(struct sample *smp, fiftyoneDegreesWorkset *ws)
 
 	// No need to null check as this has already been carried out in the
 	// calling method
-	htx = smp_prefetch_htx(smp, chn, 1);
+	htx = smp_prefetch_htx(smp, chn, NULL, 1);
 
 	for (i = 0; i < global_51degrees.header_count; i++) {
 		name.ptr = (global_51degrees.header_names + i)->area;
@@ -276,7 +276,7 @@ static void _51d_set_device_offsets(struct sample *smp, fiftyoneDegreesDeviceOff
 
 	// No need to null check as this has already been carried out in the
 	// calling method
-	htx = smp_prefetch_htx(smp, chn, 1);
+	htx = smp_prefetch_htx(smp, chn, NULL, 1);
 
 	for (i = 0; i < global_51degrees.header_count; i++) {
 		name.ptr = (global_51degrees.header_names + i)->area;
@@ -424,7 +424,7 @@ static int _51d_fetch(const struct arg *args, struct sample *smp, const char *kw
 	struct htx *htx;
 
 	chn = (smp->strm ? &smp->strm->req : NULL);
-	htx = smp_prefetch_htx(smp, chn, 1);
+	htx = smp_prefetch_htx(smp, chn, NULL, 1);
 	if (!htx)
 		return 0;