BUG/MEDIUM: lua: Fix test on the direction to set the channel exp timeout

This bug was introduced by the commit bfab2ddd ("MINOR: hlua: Add a flag on the
lua txn to know in which context it can be used"). The wrong test was done. So
the timeout was always set on the response channel. It may lead to an infinite
loop.

This patch must be backported everywhere the commit bfab2ddd is. For now, at
least to 2.0, 1.9 and 1.8.
This commit is contained in:
Christopher Faulet 2019-08-14 23:19:45 +02:00
parent 51c3aa4628
commit 81921b1371

View File

@ -6230,7 +6230,7 @@ static enum act_return hlua_action(struct act_rule *rule, struct proxy *px,
case HLUA_E_AGAIN: case HLUA_E_AGAIN:
/* Set timeout in the required channel. */ /* Set timeout in the required channel. */
if (s->hlua->wake_time != TICK_ETERNITY) { if (s->hlua->wake_time != TICK_ETERNITY) {
if (dir & SMP_OPT_DIR_REQ) if (dir == SMP_OPT_DIR_REQ)
s->req.analyse_exp = s->hlua->wake_time; s->req.analyse_exp = s->hlua->wake_time;
else else
s->res.analyse_exp = s->hlua->wake_time; s->res.analyse_exp = s->hlua->wake_time;