www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

remove lingering reslist references before killing server scope

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200646 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brian McCallister
2011-11-10 23:57:57 +00:00
parent 1278d68ae7
commit 49ac1fbeb2
4 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/lua/mod_lua.c
View File

@@ -100,7 +100,7 @@ static int lua_handler(request_rec *r)
spec = apr_pcalloc(r->pool, sizeof(ap_lua_vm_spec));
spec->scope = dcfg->vm_scope;
spec->pool = spec->scope==AP_LUA_SCOPE_SERVER ? cfg->pool : r->pool;
spec->pool = r->pool;
spec->file = r->filename;
spec->package_paths = cfg->package_paths;
spec->package_cpaths = cfg->package_cpaths;
@@ -172,7 +172,7 @@ static int lua_request_rec_hook_harness(request_rec *r, const char *name, int ap
spec->scope = hook_spec->scope;
spec->bytecode = hook_spec->bytecode;
spec->bytecode_len = hook_spec->bytecode_len;
spec->pool = spec->scope==AP_LUA_SCOPE_SERVER ? cfg->pool : r->pool;
spec->pool = r->pool;
spec->package_paths = cfg->package_paths;
spec->package_cpaths = cfg->package_cpaths;
spec->cb = &lua_open_callback;
@@ -836,8 +836,8 @@ static const char *register_lua_scope(cmd_parms *cmd,
else if (strcmp("conn", scope) == 0) {
cfg->vm_scope = AP_LUA_SCOPE_CONN;
}
else if (strcmp("server", scope) == 0) {
cfg->vm_scope = AP_LUA_SCOPE_SERVER;
else if (strcmp("thread", scope) == 0) {
cfg->vm_scope = AP_LUA_SCOPE_THREAD;
}
else {
return apr_psprintf(cmd->pool,