From: Christophe Jaillet Date: Sat, 23 Jun 2018 21:52:09 +0000 (+0000) Subject: Function used as 'apr_reslist_destructor' when calling 'apr_reslist_create()' should... X-Git-Tag: 2.5.0-alpha2-ci-test-only~2528 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e10f5c32c08eb5d3a03cbc910372cdc90839c620;p=thirdparty%2Fapache%2Fhttpd.git Function used as 'apr_reslist_destructor' when calling 'apr_reslist_create()' should have the following prototype: apr_status_t (*apr_reslist_destructor)(void *resource, void *params, apr_pool_t *pool); git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1834226 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/lua/lua_vmprep.c b/modules/lua/lua_vmprep.c index e6d68cf000a..001897a11c8 100644 --- a/modules/lua/lua_vmprep.c +++ b/modules/lua/lua_vmprep.c @@ -244,7 +244,7 @@ static apr_status_t cleanup_lua(void *l) return APR_SUCCESS; } -static apr_status_t server_cleanup_lua(void *resource) +static apr_status_t server_cleanup_lua(void *resource, void *params, apr_pool_t *pool) { ap_lua_server_spec* spec = (ap_lua_server_spec*) resource; AP_DEBUG_ASSERT(spec != NULL); @@ -311,7 +311,8 @@ static void munge_path(lua_State *L, } #ifdef AP_ENABLE_LUAJIT -static int loadjitmodule(lua_State *L, apr_pool_t *lifecycle_pool) { +static int loadjitmodule(lua_State *L, apr_pool_t *lifecycle_pool) +{ lua_getglobal(L, "require"); lua_pushliteral(L, "jit."); lua_pushvalue(L, -3);