From: Christopher Faulet <cfaulet@haproxy.com>
Date: Fri, 6 Mar 2020 14:44:37 +0000 (+0100)
Subject: BUG/MINOR: http-rules: Abort transaction when a redirect is applied on response
X-Git-Tag: v2.2-dev4~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49c2a707ce06f73a14addccc93cf403d13c15371;p=thirdparty%2Fhaproxy.git

BUG/MINOR: http-rules: Abort transaction when a redirect is applied on response

In the same way than for the request, when a redirect rule is applied the
transction is aborted. This must be done returning HTTP_RULE_RES_ABRT from
http_res_get_intercept_rule() function.

No backport needed because on previous versions, the action return values are
not handled the same way.
---

diff --git a/src/http_ana.c b/src/http_ana.c
index 34967b876e..88f7937b19 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -3110,7 +3110,7 @@ resume_execution:
 				break;
 
 			case ACT_HTTP_REDIR:
-				rule_ret = HTTP_RULE_RES_DONE;
+				rule_ret = HTTP_RULE_RES_ABRT;
 				if (!http_apply_redirect_rule(rule->arg.redir, s, txn))
 					rule_ret = HTTP_RULE_RES_ERROR;
 				goto end;