From e4acb3c39178867e9eec0de444ca4a150f664d64 Mon Sep 17 00:00:00 2001 From: Martin Vierula Date: Mon, 16 Oct 2023 12:45:36 -0700 Subject: [PATCH] Allow lua version 5.4 --- CHANGES | 2 ++ apache2/msc_lua.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 1946c2a4..3a75c62c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ 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() diff --git a/apache2/msc_lua.c b/apache2/msc_lua.c index 51be1745..2f05df65 100644 --- a/apache2/msc_lua.c +++ b/apache2/msc_lua.c @@ -429,12 +429,12 @@ int lua_execute(msc_script *script, char *param, modsec_rec *msr, msre_rule *rul #else /* 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(); #elif LUA_VERSION_NUM == 500 L = lua_open(); #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 luaL_openlibs(L); @@ -459,10 +459,10 @@ int lua_execute(msc_script *script, char *param, modsec_rec *msr, msre_rule *rul /* Register functions. */ #if LUA_VERSION_NUM == 500 || LUA_VERSION_NUM == 501 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); #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 lua_setglobal(L, "m");