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

Revert early|late argument for LuaHookCheckUserID as it does not work right now.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1604336 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Daniel Gruno
2014-06-21 10:36:56 +00:00
parent 33ef4d63bc
commit 0ac4c9dc26
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/manual/mod/mod_lua.xml
View File

@@ -1629,16 +1629,18 @@ end
<directivesynopsis> <directivesynopsis>
<name>LuaHookCheckUserID</name> <name>LuaHookCheckUserID</name>
<description>Provide a hook for the check_user_id phase of request processing</description> <description>Provide a hook for the check_user_id phase of request processing</description>
<syntax>LuaHookCheckUserID /path/to/lua/script.lua hook_function_name [early|late]</syntax> <syntax>LuaHookCheckUserID /path/to/lua/script.lua hook_function_name</syntax>
<contextlist><context>server config</context><context>virtual host</context> <contextlist><context>server config</context><context>virtual host</context>
<context>directory</context><context>.htaccess</context> <context>directory</context><context>.htaccess</context>
</contextlist> </contextlist>
<override>All</override> <override>All</override>
<!-- Third argument does not work at the moment!
<compatibility>The optional third argument is supported in 2.3.15 and later</compatibility> <compatibility>The optional third argument is supported in 2.3.15 and later</compatibility>
<usage><p>...</p> <usage><p>...</p>
<note><title>Ordering</title><p>The optional arguments "early" or "late" <note><title>Ordering</title><p>The optional arguments "early" or "late"
control when this script runs relative to other modules.</p></note> control when this script runs relative to other modules.</p></note>
</usage> </usage>
-->
</directivesynopsis> </directivesynopsis>
<directivesynopsis> <directivesynopsis>

13
modules/lua/mod_lua.c
View File

@@ -1338,7 +1338,7 @@ static const char *register_check_user_id_hook(cmd_parms *cmd, void *_cfg,
const char *when) const char *when)
{ {
int apr_hook_when = APR_HOOK_MIDDLE; int apr_hook_when = APR_HOOK_MIDDLE;
/* XXX: This does not currently work!!
if (when) { if (when) {
if (!strcasecmp(when, "early")) { if (!strcasecmp(when, "early")) {
apr_hook_when = AP_LUA_HOOK_FIRST; apr_hook_when = AP_LUA_HOOK_FIRST;
@@ -1350,7 +1350,7 @@ static const char *register_check_user_id_hook(cmd_parms *cmd, void *_cfg,
return "Third argument must be 'early' or 'late'"; return "Third argument must be 'early' or 'late'";
} }
} }
*/
return register_named_file_function_hook("check_user_id", cmd, _cfg, file, return register_named_file_function_hook("check_user_id", cmd, _cfg, file,
function, apr_hook_when); function, apr_hook_when);
} }
@@ -2093,13 +2093,16 @@ static void lua_register_hooks(apr_pool_t *p)
ap_hook_map_to_storage(lua_map_to_storage_harness, NULL, NULL, ap_hook_map_to_storage(lua_map_to_storage_harness, NULL, NULL,
APR_HOOK_MIDDLE); APR_HOOK_MIDDLE);
ap_hook_check_user_id(lua_check_user_id_harness_first, NULL, NULL, /* XXX: Does not work :(
* ap_hook_check_user_id(lua_check_user_id_harness_first, NULL, NULL,
AP_LUA_HOOK_FIRST); AP_LUA_HOOK_FIRST);
*/
ap_hook_check_user_id(lua_check_user_id_harness, NULL, NULL, ap_hook_check_user_id(lua_check_user_id_harness, NULL, NULL,
APR_HOOK_MIDDLE); APR_HOOK_MIDDLE);
ap_hook_check_user_id(lua_check_user_id_harness_last, NULL, NULL, /* XXX: Does not work :(
* ap_hook_check_user_id(lua_check_user_id_harness_last, NULL, NULL,
AP_LUA_HOOK_LAST); AP_LUA_HOOK_LAST);
*/
ap_hook_type_checker(lua_type_checker_harness, NULL, NULL, ap_hook_type_checker(lua_type_checker_harness, NULL, NULL,
APR_HOOK_MIDDLE); APR_HOOK_MIDDLE);