github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-30 11:44:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'SpiderLabs:v2/master' into v2/master

Browse Source
This commit is contained in:
Marc Stern
2023-10-17 14:07:27 +02:00
committed by GitHub
parent e9bf697c00 c060ab91bc
commit 3e14a9a6d2
3 changed files with 66 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -1,6 +1,10 @@
DD mmm YYYY - 2.9.x (to be released) DD mmm YYYY - 2.9.x (to be released)
------------------- -------------------
* Allow lua version 5.4
[Issue #2996 - @3eka, @martinhsv]
* Configure: do not check for pcre1 if pcre2 requested
[Issue #2975 - @zhaoshikui, @martinhsv]
* Check return code of apr_procattr_io_set() * Check return code of apr_procattr_io_set()
[Issue #2958 - @marcstern] [Issue #2958 - @marcstern]
* Do not escape special chars in rx pattern with macro * Do not escape special chars in rx pattern with macro

8
apache2/msc_lua.c
View File

@@ -429,12 +429,12 @@ int lua_execute(msc_script *script, char *param, modsec_rec *msr, msre_rule *rul
#else #else
/* Create new state. */ /* Create new state. */
#if LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503 || LUA_VERSION_NUM == 501 #if LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503 || LUA_VERSION_NUM == 504 || LUA_VERSION_NUM == 501
L = luaL_newstate(); L = luaL_newstate();
#elif LUA_VERSION_NUM == 500 #elif LUA_VERSION_NUM == 500
L = lua_open(); L = lua_open();
#else #else
#error We are only tested under Lua 5.0, 5.1, 5.2, or 5.3. #error We are only tested under Lua 5.0, 5.1, 5.2, 5.3, or 5.4.
#endif #endif
luaL_openlibs(L); luaL_openlibs(L);
@@ -459,10 +459,10 @@ int lua_execute(msc_script *script, char *param, modsec_rec *msr, msre_rule *rul
/* Register functions. */ /* Register functions. */
#if LUA_VERSION_NUM == 500 || LUA_VERSION_NUM == 501 #if LUA_VERSION_NUM == 500 || LUA_VERSION_NUM == 501
luaL_register(L, "m", mylib); luaL_register(L, "m", mylib);
#elif LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503 #elif LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503 || LUA_VERSION_NUM == 504
luaL_setfuncs(L, mylib, 0); luaL_setfuncs(L, mylib, 0);
#else #else
#error We are only tested under Lua 5.0, 5.1, 5.2, or 5.3. #error We are only tested under Lua 5.0, 5.1, 5.2, 5.3, or 5.4.
#endif #endif
lua_setglobal(L, "m"); lua_setglobal(L, "m");

4
build/find_pcre.m4
View File

@@ -21,6 +21,9 @@ AC_ARG_WITH(
[test_paths="${with_pcre}"], [test_paths="${with_pcre}"],
[test_paths="/usr/local/libpcre /usr/local/pcre /usr/local /opt/libpcre /opt/pcre /opt /usr"]) [test_paths="/usr/local/libpcre /usr/local/pcre /usr/local /opt/libpcre /opt/pcre /opt /usr"])
if test "x${with_pcre2}" != "x" && test "x${with_pcre2}" != "xno"; then
AC_MSG_NOTICE([pcre2 specified; omitting check for pcre])
else
AC_MSG_CHECKING([for libpcre config script]) AC_MSG_CHECKING([for libpcre config script])
dnl # Determine pcre lib directory dnl # Determine pcre lib directory
@@ -86,4 +89,5 @@ else
AC_MSG_NOTICE([using pcre v${PCRE_VERSION}]) AC_MSG_NOTICE([using pcre v${PCRE_VERSION}])
ifelse([$1], , , $1) ifelse([$1], , , $1)
fi fi
fi
]) ])