From d2a536e458f4cd7ffeadfe302c23bbfe263b0053 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 3 Jun 2024 07:11:10 +0200
Subject: Merging upstream version 3.0.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 src/http_fetch.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/http_fetch.c')

diff --git a/src/http_fetch.c b/src/http_fetch.c
index 1f3e4a0..ad1e8c5 100644
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -36,6 +36,7 @@
 #include <haproxy/sample.h>
 #include <haproxy/sc_strm.h>
 #include <haproxy/stream.h>
+#include <haproxy/log.h>
 #include <haproxy/tools.h>
 #include <haproxy/version.h>
 
@@ -314,7 +315,7 @@ struct htx *smp_prefetch_htx(struct sample *smp, struct channel *chn, struct che
 		else {
 			if (txn->status == -1)
 				txn->status = sl->info.res.status;
-			if (!(htx->flags & HTX_FL_PROXY_RESP) && txn->server_status == -1)
+			if (txn->server_status == -1)
 				txn->server_status = sl->info.res.status;
 		}
 		if (sl->flags & HTX_SL_F_VER_11)
@@ -477,7 +478,7 @@ static int smp_fetch_uniqueid(const struct arg *args, struct sample *smp, const
 {
 	struct ist unique_id;
 
-	if (LIST_ISEMPTY(&smp->sess->fe->format_unique_id))
+	if (lf_expr_isempty(&smp->sess->fe->format_unique_id))
 		return 0;
 
 	if (!smp->strm)
-- 
cgit v1.2.3