From: Christopher Faulet <cfaulet@haproxy.com>
Date: Fri, 26 Jul 2019 12:54:52 +0000 (+0200)
Subject: MINOR: hlua: Don't set request analyzers on response channel for lua actions
X-Git-Tag: v2.1-dev2~272
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=51fa358432247fe5d7259d9d8a0e08d49d429c73;p=thirdparty%2Fhaproxy.git

MINOR: hlua: Don't set request analyzers on response channel for lua actions

Setting some requests analyzers on the response channel was an old trick to be
sure to re-evaluate the request's analyers after the response's ones have been
called. It is no more necessary. In fact, this trick was removed in the version
1.8 and backported up to the version 1.6.

This patch must be backported to all versions since 1.6 to ease the backports of
fixes on the lua code.
---

diff --git a/src/hlua.c b/src/hlua.c
index 9edef63980..42d3849124 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -6232,11 +6232,8 @@ static enum act_return hlua_action(struct act_rule *rule, struct proxy *px,
 		 * is detected on a response channel. This is useful
 		 * only for actions targeted on the requests.
 		 */
-		if (HLUA_IS_WAKERESWR(s->hlua)) {
+		if (HLUA_IS_WAKERESWR(s->hlua))
 			s->res.flags |= CF_WAKE_WRITE;
-			if ((analyzer & (AN_REQ_INSPECT_FE|AN_REQ_HTTP_PROCESS_FE)))
-				s->res.analysers |= analyzer;
-		}
 		if (HLUA_IS_WAKEREQWR(s->hlua))
 			s->req.flags |= CF_WAKE_WRITE;
 		/* We can quit the function without consistency check