RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-20 12:46:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Christopher Faulet 2019-07-26 16:40:24 +02:00
parent 0d00b544c3
commit fe6a71b8e0
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/hlua.c
View File

@ -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;