mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 15:47:01 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: lua/filters: Return right code when txn:done() is called

Browse Source 
txn functions can now be called from an action or a filter context. Thus the
return code must be adapted depending on this context. From an action, act.ABORT
is returned. From a filter, -1 is returned. It is the filter error code.

This bug only affects 2.5-dev. No backport needed.
This commit is contained in:
Christopher Faulet 2021-08-13 14:11:17 +02:00
parent 26eb5ea352
commit e48d1dc2d9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hlua.c
View File

@ -7482,6 +7482,9 @@ __LJMP static int hlua_txn_done(lua_State *L)
if (!(s->flags & SF_FINST_MASK)) if (!(s->flags & SF_FINST_MASK))
s->flags |= finst; s->flags |= finst;
if ((htxn->flags & HLUA_TXN_CTX_MASK) == HLUA_TXN_FLT_CTX)
lua_pushinteger(L, -1);
else
lua_pushinteger(L, ACT_RET_ABRT); lua_pushinteger(L, ACT_RET_ABRT);
WILL_LJMP(hlua_done(L)); WILL_LJMP(hlua_done(L));
return 0; return 0;