From: Daniel Gruno <humbedooh@apache.org>
Date: Sat, 21 Jun 2014 10:36:56 +0000 (+0000)
Subject: Revert early|late argument for LuaHookCheckUserID as it does not work right now.
X-Git-Tag: 2.5.0-alpha~4038
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ac4c9dc26b9d42e7db2e3eda552f26bf530b04b;p=apache

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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1604336 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_lua.xml b/docs/manual/mod/mod_lua.xml
index 4b5ca2c9c7..8feeb864d0 100644
--- a/docs/manual/mod/mod_lua.xml
+++ b/docs/manual/mod/mod_lua.xml
@@ -1629,16 +1629,18 @@ end
 <directivesynopsis>
 <name>LuaHookCheckUserID</name>
 <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>
 <context>directory</context><context>.htaccess</context>
 </contextlist>
 <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>
 <usage><p>...</p>
    <note><title>Ordering</title><p>The optional arguments "early" or "late" 
    control when this script runs relative to other modules.</p></note>
 </usage>
+-->
 </directivesynopsis>
 
 <directivesynopsis>
diff --git a/modules/lua/mod_lua.c b/modules/lua/mod_lua.c
index 6cf2fe521f..d0ffbdb361 100644
--- a/modules/lua/mod_lua.c
+++ b/modules/lua/mod_lua.c
@@ -1338,7 +1338,7 @@ static const char *register_check_user_id_hook(cmd_parms *cmd, void *_cfg,
                                                const char *when)
 {
     int apr_hook_when = APR_HOOK_MIDDLE;
-
+/* XXX: This does not currently work!!
     if (when) {
         if (!strcasecmp(when, "early")) {
             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 register_named_file_function_hook("check_user_id", cmd, _cfg, file,
                                              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,
                            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_hook_check_user_id(lua_check_user_id_harness, NULL, NULL,
                            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_hook_type_checker(lua_type_checker_harness, NULL, NULL,
                          APR_HOOK_MIDDLE);