From 47c15640e7594d7a500326a78d904a67f7cf5137 Mon Sep 17 00:00:00 2001 From: Rainer Jung Date: Fri, 11 Nov 2011 20:51:32 +0000 Subject: [PATCH] Use the right lua scope when used as a hook. Backport of r1201042 from trunk. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201046 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 2 ++ modules/lua/mod_lua.c | 27 ++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index c921965922..5d8467e68c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache 2.3.16 + *) mod_lua: Use the right lua scope when used as a hook. [Rainer Jung] + *) configure: Only load the really imporant modules (i.e. those enabled by the 'few' selection) by default. Don't handle modules enabled with --enable-foo specially. [Stefan Fritsch] diff --git a/modules/lua/mod_lua.c b/modules/lua/mod_lua.c index b27006c377..a248e95d7d 100644 --- a/modules/lua/mod_lua.c +++ b/modules/lua/mod_lua.c @@ -168,6 +168,7 @@ static int lua_handler(request_rec *r) static int lua_request_rec_hook_harness(request_rec *r, const char *name, int apr_hook_when) { int rc; + apr_pool_t *pool; lua_State *L; ap_lua_vm_spec *spec; ap_lua_server_cfg *server_cfg = ap_get_module_config(r->server->module_config, @@ -200,7 +201,31 @@ static int lua_request_rec_hook_harness(request_rec *r, const char *name, int ap apr_filepath_merge(&spec->file, server_cfg->root_path, spec->file, APR_FILEPATH_NOTRELATIVE, r->pool); - L = ap_lua_get_lua_state(r->pool, spec); + + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, + "request details scope:%u, filename:%s, function:%s", + spec->scope, + spec->file, + hook_spec->function_name ? hook_spec->function_name : "-"); + + switch (spec->scope) { + case AP_LUA_SCOPE_ONCE: + apr_pool_create(&pool, r->pool); + break; + case AP_LUA_SCOPE_REQUEST: + pool = r->pool; + break; + case AP_LUA_SCOPE_CONN: + pool = r->connection->pool; + break; + case AP_LUA_SCOPE_THREAD: + #if APR_HAS_THREADS + pool = apr_thread_pool_get(r->connection->current_thread); + break; + #endif + } + + L = ap_lua_get_lua_state(pool, spec); if (!L) { ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, -- 2.40.0