From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 28 Jul 2020 09:40:07 +0000 (+0200)
Subject: BUG/MINOR: tcp-rules: Preserve the right filter analyser on content eval abort
X-Git-Tag: v2.3-dev2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=19dbf2d625b11e23cd45ef9d9678809a9ad602b9;p=thirdparty%2Fhaproxy.git

BUG/MINOR: tcp-rules: Preserve the right filter analyser on content eval abort

When a tcp-request or a tcp-response content ruleset evaluation is aborted, the
corresponding FLT_END analyser must be preserved, if any. But because of a typo
error, on the tcp-response content ruleset evaluation, we try to preserve the
request analyser instead of the response one.

This patch must be backported to 2.2.
---

diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index 984aa501d3..4db7dec28b 100644
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -401,7 +401,7 @@ resume_execution:
 	channel_abort(&s->req);
 
   abort:
-	rep->analysers &= AN_REQ_FLT_END;
+	rep->analysers &= AN_RES_FLT_END;
 
 	if (!(s->flags & SF_ERR_MASK))
 		s->flags |= SF_ERR_PRXCOND;