github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 05:45:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Allow LuaJIT 2.1 to be used

Browse Source
This commit is contained in:
Victor Hora 2018-10-12 17:31:09 -04:00
parent 28f6f2201f
commit 20ef01d75c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/lua.m4
View File

@ -68,7 +68,8 @@ else
case $LUA_PKG_VERSION in case $LUA_PKG_VERSION in
(5.1*) LUA_CFLAGS="-DWITH_LUA_5_1 ${LUA_CFLAGS}" ; lua_5_1=1 ;; (5.1*) LUA_CFLAGS="-DWITH_LUA_5_1 ${LUA_CFLAGS}" ; lua_5_1=1 ;;
(5.2*) LUA_CFLAGS="-DWITH_LUA_5_2 ${LUA_CFLAGS}" ; lua_5_2=1 ;; (5.2*) LUA_CFLAGS="-DWITH_LUA_5_2 ${LUA_CFLAGS}" ; lua_5_2=1 ;;
(2.*) LUA_CFLAGS="-DWITH_LUA_5_1 ${LUA_CFLAGS}" ; lua_5_1=1 ;; (2.0*) LUA_CFLAGS="-DWITH_LUA_5_1 ${LUA_CFLAGS}" ; lua_5_1=1 ;;
(2.1*) LUA_CFLAGS="-DWITH_LUA_5_1 -DWITH_LUA_JIT_2_1 ${LUA_CFLAGS}" ; lua_5_1=1 ;;
esac esac
AC_MSG_NOTICE([LUA pkg-config version: ${LUA_PKG_VERSION}]) AC_MSG_NOTICE([LUA pkg-config version: ${LUA_PKG_VERSION}])
fi fi

2
src/engine/lua.h
View File

@ -102,7 +102,7 @@ static const struct luaL_Reg mscLuaLib[] = {
} // namespace modsecurity } // namespace modsecurity
#ifdef WITH_LUA #ifdef WITH_LUA
#if defined LUA_VERSION_NUM && LUA_VERSION_NUM < 502 #if defined LUA_VERSION_NUM && LUA_VERSION_NUM < 502 && !defined WITH_LUA_JIT_2_1
/* /*
** Adapted from Lua 5.2.0 ** Adapted from Lua 5.2.0
*/ */