mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: lua: bad error processing

Browse Source 
When the lua actions (http|tcp)-(request|rersponse) fails a yield is
returned. this patch fix the behavior and returns a continue.
This commit is contained in:
Thierry FOURNIER 2015-08-19 10:42:42 +02:00 committed by Willy Tarreau
parent 386a127ff0
commit c7d7607351
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hlua.c
View File

@ -4284,7 +4284,7 @@ static int hlua_request_act_wrapper(struct hlua_rule *rule, struct proxy *px,
send_log(px, LOG_ERR, "Lua action '%s': can't initialize Lua context.", rule->fcn.name); send_log(px, LOG_ERR, "Lua action '%s': can't initialize Lua context.", rule->fcn.name);
if (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE)) if (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE))
Alert("Lua action '%s': can't initialize Lua context.\n", rule->fcn.name); Alert("Lua action '%s': can't initialize Lua context.\n", rule->fcn.name);
return 0; return 1;
} }
/* If it is the first run, initialize the data for the call. */ /* If it is the first run, initialize the data for the call. */
@ -4294,7 +4294,7 @@ static int hlua_request_act_wrapper(struct hlua_rule *rule, struct proxy *px,
send_log(px, LOG_ERR, "Lua function '%s': full stack.", rule->fcn.name); send_log(px, LOG_ERR, "Lua function '%s': full stack.", rule->fcn.name);
if (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE)) if (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE))
Alert("Lua function '%s': full stack.\n", rule->fcn.name); Alert("Lua function '%s': full stack.\n", rule->fcn.name);
return 0; return 1;
} }
/* Restore the function in the stack. */ /* Restore the function in the stack. */
@ -4305,7 +4305,7 @@ static int hlua_request_act_wrapper(struct hlua_rule *rule, struct proxy *px,
send_log(px, LOG_ERR, "Lua function '%s': full stack.", rule->fcn.name); send_log(px, LOG_ERR, "Lua function '%s': full stack.", rule->fcn.name);
if (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE)) if (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE))
Alert("Lua function '%s': full stack.\n", rule->fcn.name); Alert("Lua function '%s': full stack.\n", rule->fcn.name);
return 0; return 1;
} }
s->hlua.nargs = 1; s->hlua.nargs = 1;
@ -4315,7 +4315,7 @@ static int hlua_request_act_wrapper(struct hlua_rule *rule, struct proxy *px,
send_log(px, LOG_ERR, "Lua function '%s': full stack.", rule->fcn.name); send_log(px, LOG_ERR, "Lua function '%s': full stack.", rule->fcn.name);
if (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE)) if (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE))
Alert("Lua function '%s': full stack.\n", rule->fcn.name); Alert("Lua function '%s': full stack.\n", rule->fcn.name);
return 0; return 1;
} }
lua_pushstring(s->hlua.T, *arg); lua_pushstring(s->hlua.T, *arg);
s->hlua.nargs++; s->hlua.nargs++;