www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Decouple mod_lua max regex matches from AP_MAX_REG_MATCH.

Browse Source 
Bumped the default to 25 matches; this default can be
overwritten with a CLFAGS define.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1467718 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Guenter Knauf
2013-04-14 02:36:23 +00:00
parent 9e2cdeff43
commit 97e8153a9c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/lua/lua_request.c
View File

@@ -25,6 +25,10 @@
APLOG_USE_MODULE(lua); APLOG_USE_MODULE(lua);
#define POST_MAX_VARS 500 #define POST_MAX_VARS 500
#ifndef MODLUA_MAX_REG_MATCH
#define MODLUA_MAX_REG_MATCH 25
#endif
typedef char *(*req_field_string_f) (request_rec * r); typedef char *(*req_field_string_f) (request_rec * r);
typedef int (*req_field_int_f) (request_rec * r); typedef int (*req_field_int_f) (request_rec * r);
typedef apr_table_t *(*req_field_apr_table_f) (request_rec * r); typedef apr_table_t *(*req_field_apr_table_f) (request_rec * r);
@@ -898,7 +902,7 @@ static int lua_ap_regex(lua_State *L)
*source; *source;
char *err; char *err;
ap_regex_t regex; ap_regex_t regex;
ap_regmatch_t matches[AP_MAX_REG_MATCH+1]; ap_regmatch_t matches[MODLUA_MAX_REG_MATCH+1];
luaL_checktype(L, 1, LUA_TUSERDATA); luaL_checktype(L, 1, LUA_TUSERDATA);
luaL_checktype(L, 2, LUA_TSTRING); luaL_checktype(L, 2, LUA_TSTRING);
@@ -917,7 +921,7 @@ static int lua_ap_regex(lua_State *L)
return 2; return 2;
} }
rv = ap_regexec(&regex, source, AP_MAX_REG_MATCH, matches, 0); rv = ap_regexec(&regex, source, MODLUA_MAX_REG_MATCH, matches, 0);
if (rv == AP_REG_NOMATCH) { if (rv == AP_REG_NOMATCH) {
lua_pushboolean(L, 0); lua_pushboolean(L, 0);
return 1; return 1;