httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From humbed...@apache.org
Subject svn commit: r1604336 - in /httpd/httpd/trunk: docs/manual/mod/mod_lua.xml modules/lua/mod_lua.c
Date Sat, 21 Jun 2014 10:36:56 GMT
Author: humbedooh
Date: Sat Jun 21 10:36:56 2014
New Revision: 1604336

URL: http://svn.apache.org/r1604336
Log:
Revert early|late argument for LuaHookCheckUserID as it does not work right now.

Modified:
    httpd/httpd/trunk/docs/manual/mod/mod_lua.xml
    httpd/httpd/trunk/modules/lua/mod_lua.c

Modified: httpd/httpd/trunk/docs/manual/mod/mod_lua.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_lua.xml?rev=1604336&r1=1604335&r2=1604336&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_lua.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_lua.xml Sat Jun 21 10:36:56 2014
@@ -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>

Modified: httpd/httpd/trunk/modules/lua/mod_lua.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/mod_lua.c?rev=1604336&r1=1604335&r2=1604336&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/mod_lua.c (original)
+++ httpd/httpd/trunk/modules/lua/mod_lua.c Sat Jun 21 10:36:56 2014
@@ -1338,7 +1338,7 @@ static const char *register_check_user_i
                                                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_i
             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_
     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);
 



Mime
View raw message