You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2017/07/04 21:48:41 UTC
svn commit: r1800830 - in /httpd/httpd/trunk/modules/lua: lua_config.c
lua_request.c mod_lua.h
Author: rjung
Date: Tue Jul 4 21:48:41 2017
New Revision: 1800830
URL: http://svn.apache.org/viewvc?rev=1800830&view=rev
Log:
Fix new compilation breakage in mod_lua.
Modified:
httpd/httpd/trunk/modules/lua/lua_config.c
httpd/httpd/trunk/modules/lua/lua_request.c
httpd/httpd/trunk/modules/lua/mod_lua.h
Modified: httpd/httpd/trunk/modules/lua/lua_config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/lua_config.c?rev=1800830&r1=1800829&r2=1800830&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/lua_config.c (original)
+++ httpd/httpd/trunk/modules/lua/lua_config.c Tue Jul 4 21:48:41 2017
@@ -265,13 +265,13 @@ void ap_lua_load_config_lmodule(lua_Stat
lua_pushvalue(L, -1);
lua_setfield(L, -2, "__index");
- luaL_setfuncs(L, cfg_methods); /* [metatable] */
+ luaL_setfuncs_compat(L, cfg_methods); /* [metatable] */
luaL_newmetatable(L, "Apache2.CommandParameters");
lua_pushvalue(L, -1);
lua_setfield(L, -2, "__index");
- luaL_setfuncs(L, cmd_methods); /* [metatable] */
+ luaL_setfuncs_compat(L, cmd_methods); /* [metatable] */
}
Modified: httpd/httpd/trunk/modules/lua/lua_request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/lua_request.c?rev=1800830&r1=1800829&r2=1800830&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/lua_request.c (original)
+++ httpd/httpd/trunk/modules/lua/lua_request.c Tue Jul 4 21:48:41 2017
@@ -2955,27 +2955,27 @@ void ap_lua_load_request_lmodule(lua_Sta
lua_pushlightuserdata(L, dispatch);
lua_setfield(L, LUA_REGISTRYINDEX, "Apache2.Request.dispatch");
- luaL_newmetatable(L, "Apache2.Request"); /* [metatable] */
+ luaL_newmetatable(L, "Apache2.Request"); /* [metatable] */
lua_pushvalue(L, -1);
lua_setfield(L, -2, "__index");
- luaL_setfuncs(L, request_methods); /* [metatable] */
+ luaL_setfuncs_compat(L, request_methods); /* [metatable] */
lua_pop(L, 2);
- luaL_newmetatable(L, "Apache2.Connection"); /* [metatable] */
+ luaL_newmetatable(L, "Apache2.Connection"); /* [metatable] */
lua_pushvalue(L, -1);
lua_setfield(L, -2, "__index");
- luaL_setfuncs(L, connection_methods); /* [metatable] */
+ luaL_setfuncs_compat(L, connection_methods); /* [metatable] */
lua_pop(L, 2);
- luaL_newmetatable(L, "Apache2.Server"); /* [metatable] */
+ luaL_newmetatable(L, "Apache2.Server"); /* [metatable] */
lua_pushvalue(L, -1);
lua_setfield(L, -2, "__index");
- luaL_setfuncs(L, server_methods); /* [metatable] */
+ luaL_setfuncs_compat(L, server_methods); /* [metatable] */
lua_pop(L, 2);
Modified: httpd/httpd/trunk/modules/lua/mod_lua.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/mod_lua.h?rev=1800830&r1=1800829&r2=1800830&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/mod_lua.h (original)
+++ httpd/httpd/trunk/modules/lua/mod_lua.h Tue Jul 4 21:48:41 2017
@@ -49,12 +49,10 @@
/* Load mode for lua_load() */
#define lua_load(a,b,c,d) lua_load(a,b,c,d,NULL)
#define lua_resume(a,b) lua_resume(a, NULL, b)
-#define luaL_loadfile(a,b) luaL_loadfilex(a,b,NULL)
-#define luaL_loadbuffer(a,b,c,d) luaL_loadbufferx(a,b,c,d,NULL)
-#define luaL_setfuncs(a,b) luaL_setfuncs(a,b,0)
+#define luaL_setfuncs_compat(a,b) luaL_setfuncs(a,b,0)
#else
#define lua_rawlen(L,i) lua_objlen(L, (i))
-#define luaL_setfuncs(a,b) luaL_register(a,NULL,b)
+#define luaL_setfuncs_compat(a,b) luaL_register(a,NULL,b)
#endif
#if LUA_VERSION_NUM > 502
#define lua_dump(a,b,c,d) lua_dump(a,b,c,d,0)