You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2011/12/30 12:02:31 UTC
svn commit: r1225800 - in /httpd/httpd/branches/2.4.x: ./
modules/generators/mod_info.c
Author: sf
Date: Fri Dec 30 11:02:30 2011
New Revision: 1225800
URL: http://svn.apache.org/viewvc?rev=1225800&view=rev
Log:
Merge r1225795:
Display all those shiny new hooks that we have in 2.4
Add new section "Other Hooks" for those that don't fit into "Startup Hooks"
or "Request Hooks"
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/modules/generators/mod_info.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 30 11:02:30 2011
@@ -1,3 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap:1150158-1150173
/httpd/httpd/branches/wombat-integration:723609-723841
-/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663,1211680,1212883,1213338,1213567,1214003,1214005,1214015,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1223048,1225060,1225197-1225198,1225380,1225476,1225478,1225791
+/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663,1211680,1212883,1213338,1213567,1214003,1214005,1214015,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1223048,1225060,1225197-1225198,1225380,1225476,1225478,1225791,1225795
Modified: httpd/httpd/branches/2.4.x/modules/generators/mod_info.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/generators/mod_info.c?rev=1225800&r1=1225799&r2=1225800&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/generators/mod_info.c (original)
+++ httpd/httpd/branches/2.4.x/modules/generators/mod_info.c Fri Dec 30 11:02:30 2011
@@ -61,6 +61,7 @@
#include "http_request.h"
#include "util_script.h"
#include "ap_mpm.h"
+#include "mpm_common.h"
#include <stdio.h>
typedef struct
@@ -300,6 +301,10 @@ static hook_lookup_t startup_hooks[] = {
{"Test Configuration", ap_hook_get_test_config},
{"Post Configuration", ap_hook_get_post_config},
{"Open Logs", ap_hook_get_open_logs},
+ {"Pre-MPM", ap_hook_get_pre_mpm},
+ {"MPM", ap_hook_get_mpm},
+ {"Drop Privileges", ap_hook_get_drop_privileges},
+ {"Retrieve Optional Functions", ap_hook_get_optional_fn_retrieve},
{"Child Init", ap_hook_get_child_init},
{NULL},
};
@@ -309,6 +314,7 @@ static hook_lookup_t request_hooks[] = {
{"Create Connection", ap_hook_get_create_connection},
{"Process Connection", ap_hook_get_process_connection},
{"Create Request", ap_hook_get_create_request},
+ {"Pre-Read Request", ap_hook_get_pre_read_request},
{"Post-Read Request", ap_hook_get_post_read_request},
{"Header Parse", ap_hook_get_header_parser},
{"HTTP Scheme", ap_hook_get_http_scheme},
@@ -316,15 +322,34 @@ static hook_lookup_t request_hooks[] = {
{"Quick Handler", ap_hook_get_quick_handler},
{"Translate Name", ap_hook_get_translate_name},
{"Map to Storage", ap_hook_get_map_to_storage},
- {"Check Access", ap_hook_get_access_checker},
+ {"Check Access", ap_hook_get_access_checker_ex},
+ {"Check Access (legacy)", ap_hook_get_access_checker},
{"Verify User ID", ap_hook_get_check_user_id},
+ {"Note Authentication Failure", ap_hook_get_note_auth_failure},
{"Verify User Access", ap_hook_get_auth_checker},
{"Check Type", ap_hook_get_type_checker},
{"Fixups", ap_hook_get_fixups},
{"Insert Filters", ap_hook_get_insert_filter},
{"Content Handlers", ap_hook_get_handler},
- {"Logging", ap_hook_get_log_transaction},
+ {"Transaction Logging", ap_hook_get_log_transaction},
{"Insert Errors", ap_hook_get_insert_error_filter},
+ {"Generate Log ID", ap_hook_get_generate_log_id},
+ {NULL},
+};
+
+static hook_lookup_t other_hooks[] = {
+ {"Monitor", ap_hook_get_monitor},
+ {"Child Status", ap_hook_get_child_status},
+ {"End Generation", ap_hook_get_end_generation},
+ {"Error Logging", ap_hook_get_error_log},
+ {"Query MPM Attributes", ap_hook_get_mpm_query},
+ {"Query MPM Name", ap_hook_get_mpm_get_name},
+ {"Register Timed Callback", ap_hook_get_mpm_register_timed_callback},
+ {"Extend Expression Parser", ap_hook_get_expr_lookup},
+ {"Set Management Items", ap_hook_get_get_mgmt_items},
+#if AP_ENABLE_EXCEPTION_HOOK
+ {"Handle Fatal Exceptions", ap_hook_get_fatal_exception},
+#endif
{NULL},
};
@@ -646,6 +671,17 @@ static int show_active_hooks(request_rec
ap_rputs("\n </tt>\n</dt>\n", r);
}
+ ap_rputs
+ ("</dl>\n<hr />\n<h2><a name=\"other_hooks\">Other Hooks</a></h2>\n<dl>",
+ r);
+
+ for (i = 0; other_hooks[i].name; i++) {
+ ap_rprintf(r, "<dt><strong>%s:</strong>\n <br /><tt>\n",
+ other_hooks[i].name);
+ dump_a_hook(r, other_hooks[i].get);
+ ap_rputs("\n </tt>\n</dt>\n", r);
+ }
+
ap_rputs("</dl>\n<hr />\n", r);
return 0;
@@ -687,7 +723,8 @@ static int display_info(request_rec * r)
ap_rputs("<a href=\"#modules\">Loaded Modules</a>, "
"<a href=\"#server\">Server Settings</a>, "
"<a href=\"#startup_hooks\">Startup Hooks</a>, "
- "<a href=\"#request_hooks\">Request Hooks</a>", r);
+ "<a href=\"#request_hooks\">Request Hooks</a>, "
+ "<a href=\"#other_hooks\">Other Hooks</a>", r);
ap_rputs("</tt></dt></dl><hr />", r);
ap_rputs("<h2><a name=\"modules\">Loaded Modules</a></h2>"