You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by pq...@apache.org on 2008/11/08 09:06:37 UTC
svn commit: r712363 - /httpd/mod_wombat/trunk/mod_wombat.c
Author: pquerna
Date: Sat Nov 8 00:06:37 2008
New Revision: 712363
URL: http://svn.apache.org/viewvc?rev=712363&view=rev
Log:
Add block support for all of the other hooks.
Modified:
httpd/mod_wombat/trunk/mod_wombat.c
Modified: httpd/mod_wombat/trunk/mod_wombat.c
URL: http://svn.apache.org/viewvc/httpd/mod_wombat/trunk/mod_wombat.c?rev=712363&r1=712362&r2=712363&view=diff
==============================================================================
--- httpd/mod_wombat/trunk/mod_wombat.c (original)
+++ httpd/mod_wombat/trunk/mod_wombat.c Sat Nov 8 00:06:37 2008
@@ -505,26 +505,44 @@
static const char* register_fixups_hook(cmd_parms *cmd, void *_cfg, const char *file, const char *function) {
return register_named_file_function_hook("fixups", cmd, _cfg, file, function);
}
+static const char* register_fixups_block(cmd_parms *cmd, void *_cfg, const char *line) {
+ return register_named_block_function_hook("fixups", cmd, _cfg, line);
+}
static const char* register_map_to_storage_hook(cmd_parms *cmd, void *_cfg, const char *file, const char *function) {
return register_named_file_function_hook("map_to_storage", cmd, _cfg, file, function);
}
+static const char* register_map_to_storage_block(cmd_parms *cmd, void *_cfg, const char *line) {
+ return register_named_block_function_hook("map_to_storage", cmd, _cfg, line);
+}
static const char* register_check_user_id_hook(cmd_parms *cmd, void *_cfg, const char *file, const char *function) {
return register_named_file_function_hook("check_user_id", cmd, _cfg, file, function);
}
+static const char* register_check_user_id_block(cmd_parms *cmd, void *_cfg, const char *line) {
+ return register_named_block_function_hook("check_user_id", cmd, _cfg, line);
+}
static const char* register_type_checker_hook(cmd_parms *cmd, void *_cfg, const char *file, const char *function) {
return register_named_file_function_hook("type_checker", cmd, _cfg, file, function);
}
+static const char* register_type_checker_block(cmd_parms *cmd, void *_cfg, const char *line) {
+ return register_named_block_function_hook("type_checker", cmd, _cfg, line);
+}
static const char* register_access_checker_hook(cmd_parms *cmd, void *_cfg, const char *file, const char *function) {
return register_named_file_function_hook("access_checker", cmd, _cfg, file, function);
}
+static const char* register_access_checker_block(cmd_parms *cmd, void *_cfg, const char *line) {
+ return register_named_block_function_hook("access_checker", cmd, _cfg, line);
+}
static const char* register_auth_checker_hook(cmd_parms *cmd, void *_cfg, const char *file, const char *function) {
return register_named_file_function_hook("auth_checker", cmd, _cfg, file, function);
}
+static const char* register_auth_checker_block(cmd_parms *cmd, void *_cfg, const char *line) {
+ return register_named_block_function_hook("auth_checker", cmd, _cfg, line);
+}
static const char* register_insert_filter_hook(cmd_parms *cmd, void *_cfg, const char *file, const char *function) {
return "LuaHookInsertFilter not yet implemented";
@@ -533,6 +551,9 @@
static const char* register_quick_hook(cmd_parms *cmd, void *_cfg, const char *file, const char *function) {
return register_named_file_function_hook("quick", cmd, _cfg, file, function);
}
+static const char* register_quick_block(cmd_parms *cmd, void *_cfg, const char *line) {
+ return "LuaQuickHook in an inline block not yet implemented";
+}
@@ -666,34 +687,51 @@
AP_INIT_TAKE2("LuaHookTranslateName", register_translate_name_hook, NULL, OR_ALL,
"Provide a hook for the translate name phase of request processing"),
-
AP_INIT_RAW_ARGS("<LuaHookTranslateName", register_translate_name_block, NULL,
EXEC_ON_READ|OR_ALL,
- "Provide a inline hook for the translate name phase of request processing"),
+ "Provide a hook for the translate name phase of request processing"),
AP_INIT_TAKE2("LuaHookFixups", register_fixups_hook, NULL, OR_ALL,
"Provide a hook for the fixups phase of request processing"),
-
- // todo: test
+ AP_INIT_RAW_ARGS("<LuaHookFixups", register_fixups_block, NULL,
+ EXEC_ON_READ|OR_ALL,
+ "Provide a inline hook for the fixups phase of request processing"),
+
+// todo: test
AP_INIT_TAKE2("LuaHookMapToStorage", register_map_to_storage_hook, NULL, OR_ALL,
"Provide a hook for the map_to_storage phase of request processing"),
-
+ AP_INIT_RAW_ARGS("<LuaHookMapToStorage", register_map_to_storage_block, NULL,
+ EXEC_ON_READ|OR_ALL,
+ "Provide a hook for the map_to_storage phase of request processing"),
+
// todo: test
AP_INIT_TAKE2("LuaHookCheckUserID", register_check_user_id_hook, NULL, OR_ALL,
"Provide a hook for the check_user_id phase of request processing"),
-
+ AP_INIT_RAW_ARGS("<LuaHookCheckUserID", register_check_user_id_block, NULL,
+ EXEC_ON_READ|OR_ALL,
+ "Provide a hook for the check_user_id phase of request processing"),
+
// todo: test
AP_INIT_TAKE2("LuaHookTypeChecker", register_type_checker_hook, NULL, OR_ALL,
"Provide a hook for the type_checker phase of request processing"),
-
+ AP_INIT_RAW_ARGS("<LuaHookTypeChecker", register_type_checker_block, NULL,
+ EXEC_ON_READ|OR_ALL,
+ "Provide a hook for the type_checker phase of request processing"),
+
// todo: test
AP_INIT_TAKE2("LuaHookAccessChecker", register_access_checker_hook, NULL, OR_ALL,
"Provide a hook for the access_checker phase of request processing"),
-
+ AP_INIT_RAW_ARGS("<LuaHookAccessChecker", register_access_checker_block, NULL,
+ EXEC_ON_READ|OR_ALL,
+ "Provide a hook for the access_checker phase of request processing"),
+
// todo: test
AP_INIT_TAKE2("LuaHookAuthChecker", register_auth_checker_hook, NULL, OR_ALL,
"Provide a hook for the auth_checker phase of request processing"),
-
+ AP_INIT_RAW_ARGS("<LuaHookAuthChecker", register_auth_checker_block, NULL,
+ EXEC_ON_READ|OR_ALL,
+ "Provide a hook for the auth_checker phase of request processing"),
+
// todo: test
AP_INIT_TAKE2("LuaHookInsertFilter", register_insert_filter_hook, NULL, OR_ALL,
"Provide a hook for the insert_filter phase of request processing"),
@@ -707,6 +745,9 @@
AP_INIT_TAKE2("LuaQuickHandler", register_quick_hook, NULL, OR_ALL,
"Provide a hook for the quick handler of request processing"),
+ AP_INIT_RAW_ARGS("<LuaQuickHandler", register_quick_block, NULL,
+ EXEC_ON_READ|OR_ALL,
+ "Provide a hook for the quick handler of request processing"),
AP_INIT_RAW_ARGS("Lua_____ByteCodeHack", hack_section_handler, NULL, OR_ALL,
"(internal) Byte code handler"),