diff options
Diffstat (limited to 'modules/lua/mod_lua.c')
| -rw-r--r-- | modules/lua/mod_lua.c | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/modules/lua/mod_lua.c b/modules/lua/mod_lua.c index 6e3390fb..8f09cfe1 100644 --- a/modules/lua/mod_lua.c +++ b/modules/lua/mod_lua.c @@ -709,6 +709,29 @@ static int lua_request_rec_hook_harness(request_rec *r, const char *name, int ap return DECLINED; } +static int lua_map_handler_fixups(request_rec *r) +{ + /* If there is no handler set yet, this might be a LuaMapHandler request */ + if (r->handler == NULL) { + int n = 0; + ap_regmatch_t match[10]; + const ap_lua_dir_cfg *cfg = ap_get_module_config(r->per_dir_config, + &lua_module); + for (n = 0; n < cfg->mapped_handlers->nelts; n++) { + ap_lua_mapped_handler_spec *hook_spec = + ((ap_lua_mapped_handler_spec **) cfg->mapped_handlers->elts)[n]; + + if (hook_spec == NULL) { + continue; + } + if (!ap_regexec(hook_spec->uri_pattern, r->uri, 10, match, 0)) { + r->handler = apr_pstrdup(r->pool, "lua-map-handler"); + return OK; + } + } + } + return DECLINED; +} static int lua_map_handler(request_rec *r) { @@ -954,11 +977,11 @@ static const char *register_named_block_function_hook(const char *name, if (line[0]) { const char *word; word = ap_getword_conf(cmd->temp_pool, &line); - if (word && *word) { + if (*word) { function = apr_pstrdup(cmd->pool, word); } word = ap_getword_conf(cmd->temp_pool, &line); - if (word && *word) { + if (*word) { if (!strcasecmp("early", word)) { when = AP_LUA_HOOK_FIRST; } @@ -2032,6 +2055,8 @@ static void lua_register_hooks(apr_pool_t *p) APR_OPTIONAL_HOOK(ap_lua, lua_request, lua_request_hook, NULL, NULL, APR_HOOK_REALLY_FIRST); ap_hook_handler(lua_map_handler, NULL, NULL, AP_LUA_HOOK_FIRST); + /* Hook this right before FallbackResource kicks in */ + ap_hook_fixups(lua_map_handler_fixups, NULL, NULL, AP_LUA_HOOK_LAST-2); #if APR_HAS_THREADS ap_hook_child_init(ap_lua_init_mutex, NULL, NULL, APR_HOOK_MIDDLE); #endif |