From: Willy Tarreau <w@1wt.eu>
Date: Fri, 7 May 2021 06:19:30 +0000 (+0200)
Subject: BUG/MINOR: stream: properly clear the previous error mask on L7 retries
X-Git-Tag: v2.4-dev19~105
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75a4284babf50feecac17f9b32d07509b6c519ed;p=thirdparty%2Fhaproxy.git

BUG/MINOR: stream: properly clear the previous error mask on L7 retries

The cleanup of the previous error was incorrect on L7 retries, it would
OR two values while they're part of an enum, leaving some bits set.
Depending on the errors it was possible to occasionally see an internal
error ("I" flag) being logged.

This should be backported as far as 2.0, though the do_l7_retry() function
in in proto_htx.c in older versions.
---

diff --git a/src/http_ana.c b/src/http_ana.c
index 7c5e3ff66d..bed8d09b49 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -1316,7 +1316,7 @@ static __inline int do_l7_retry(struct stream *s, struct stream_interface *si)
 	res->to_forward = 0;
 	res->analyse_exp = TICK_ETERNITY;
 	res->total = 0;
-	s->flags &= ~(SF_ERR_SRVTO | SF_ERR_SRVCL);
+	s->flags &= ~SF_ERR_MASK;
 	si_release_endpoint(&s->si[1]);
 
 	b_reset(&req->buf);