www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-05 16:55:50 +03:00
Code Activity

Fix new compilation breakage in mod_lua.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800830 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Rainer Jung
2017-07-04 21:48:41 +00:00
parent 4b3557a8e9
commit fe1923bb91
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/lua/lua_config.c
View File

@@ -265,13 +265,13 @@ void ap_lua_load_config_lmodule(lua_State *L)
lua_pushvalue(L, -1); lua_pushvalue(L, -1);
lua_setfield(L, -2, "__index"); lua_setfield(L, -2, "__index");
luaL_setfuncs(L, cfg_methods); /* [metatable] */ luaL_setfuncs_compat(L, cfg_methods); /* [metatable] */
luaL_newmetatable(L, "Apache2.CommandParameters"); luaL_newmetatable(L, "Apache2.CommandParameters");
lua_pushvalue(L, -1); lua_pushvalue(L, -1);
lua_setfield(L, -2, "__index"); lua_setfield(L, -2, "__index");
luaL_setfuncs(L, cmd_methods); /* [metatable] */ luaL_setfuncs_compat(L, cmd_methods); /* [metatable] */
} }

12
modules/lua/lua_request.c
View File

@@ -2955,27 +2955,27 @@ void ap_lua_load_request_lmodule(lua_State *L, apr_pool_t *p)
lua_pushlightuserdata(L, dispatch); lua_pushlightuserdata(L, dispatch);
lua_setfield(L, LUA_REGISTRYINDEX, "Apache2.Request.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_pushvalue(L, -1);
lua_setfield(L, -2, "__index"); lua_setfield(L, -2, "__index");
luaL_setfuncs(L, request_methods); /* [metatable] */ luaL_setfuncs_compat(L, request_methods); /* [metatable] */
lua_pop(L, 2); lua_pop(L, 2);
luaL_newmetatable(L, "Apache2.Connection"); /* [metatable] */ luaL_newmetatable(L, "Apache2.Connection"); /* [metatable] */
lua_pushvalue(L, -1); lua_pushvalue(L, -1);
lua_setfield(L, -2, "__index"); lua_setfield(L, -2, "__index");
luaL_setfuncs(L, connection_methods); /* [metatable] */ luaL_setfuncs_compat(L, connection_methods); /* [metatable] */
lua_pop(L, 2); lua_pop(L, 2);
luaL_newmetatable(L, "Apache2.Server"); /* [metatable] */ luaL_newmetatable(L, "Apache2.Server"); /* [metatable] */
lua_pushvalue(L, -1); lua_pushvalue(L, -1);
lua_setfield(L, -2, "__index"); lua_setfield(L, -2, "__index");
luaL_setfuncs(L, server_methods); /* [metatable] */ luaL_setfuncs_compat(L, server_methods); /* [metatable] */
lua_pop(L, 2); lua_pop(L, 2);

6
modules/lua/mod_lua.h
View File

@@ -49,12 +49,10 @@
/* Load mode for lua_load() */ /* Load mode for lua_load() */
#define lua_load(a,b,c,d) lua_load(a,b,c,d,NULL) #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 lua_resume(a,b) lua_resume(a, NULL, b)
#define luaL_loadfile(a,b) luaL_loadfilex(a,b,NULL) #define luaL_setfuncs_compat(a,b) luaL_setfuncs(a,b,0)
#define luaL_loadbuffer(a,b,c,d) luaL_loadbufferx(a,b,c,d,NULL)
#define luaL_setfuncs(a,b) luaL_setfuncs(a,b,0)
#else #else
#define lua_rawlen(L,i) lua_objlen(L, (i)) #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 #endif
#if LUA_VERSION_NUM > 502 #if LUA_VERSION_NUM > 502
#define lua_dump(a,b,c,d) lua_dump(a,b,c,d,0) #define lua_dump(a,b,c,d) lua_dump(a,b,c,d,0)