From: Christopher Faulet <cfaulet@haproxy.com>
Date: Fri, 26 Jul 2019 14:40:24 +0000 (+0200)
Subject: BUG/MINOR: hlua/htx: Reset channels analyzers when txn:done() is called
X-Git-Tag: v2.1-dev2~274
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fe6a71b8e08234dbe03fbd2fa3017590681479df;p=thirdparty%2Fhaproxy.git

BUG/MINOR: hlua/htx: Reset channels analyzers when txn:done() is called

For HTX streams, when txn:done() is called, the work is delegated to the
function http_reply_and_close(). But it is not enough. The channel's analyzers
must also be reset. Otherwise, some analyzers may still be called while
processing should be aborted.

For instance, if the function is called from an http-request rules on the
frontend, request analyzers on the backend side are still called. So we may try
to add an header to the request, while this one was already reset.

This patch must be backported to 2.0 and 1.9.
---

diff --git a/src/hlua.c b/src/hlua.c
index 58803e2b3b..63768aa63b 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -5374,8 +5374,10 @@ __LJMP static int hlua_txn_done(lua_State *L)
 	ic = &htxn->s->req;
 	oc = &htxn->s->res;
 
-	if (IS_HTX_STRM(htxn->s))
+	if (IS_HTX_STRM(htxn->s)) {
+		htxn->s->txn->status = 0;
 		http_reply_and_close(htxn->s, 0, NULL);
+	}
 	else {
 		channel_auto_read(ic);
 		channel_abort(ic);
@@ -5387,9 +5389,14 @@ __LJMP static int hlua_txn_done(lua_State *L)
 		channel_auto_close(oc);
 		channel_shutr_now(oc);
 
-		ic->analysers = 0;
 	}
 
+	ic->analysers &= AN_REQ_FLT_END;
+	oc->analysers &= AN_RES_FLT_END;
+
+	if (!(htxn->s->flags & SF_ERR_MASK))      // this is not really an error but it is
+		htxn->s->flags |= SF_ERR_LOCAL;   // to mark that it comes from the proxy
+
 	hlua->flags |= HLUA_STOP;
 	WILL_LJMP(hlua_done(L));
 	return 0;