From: Jeff Trawick <trawick@apache.org>
Date: Wed, 10 Jan 2001 17:31:04 +0000 (+0000)
Subject: get mod_info working again (mostly)
X-Git-Tag: APACHE_2_0_BETA_CANDIDATE_1~235
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24588fe387ec4714e26f53a53a8aae07a7fedf70;p=apache

get mod_info working again (mostly)

(I guess I should simply zap the code to list the handlers
for each module?)


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

diff --git a/modules/generators/mod_info.c b/modules/generators/mod_info.c
index 71be9f907a..7cc0bc69b5 100644
--- a/modules/generators/mod_info.c
+++ b/modules/generators/mod_info.c
@@ -269,7 +269,9 @@ static int display_info(request_rec *r)
     const char *cfname;
     const char *more_info;
     const command_rec *cmd = NULL;
+#ifdef NEVERMORE
     const handler_rec *hand = NULL;
+#endif
     server_rec *serv = r->server;
     int comma = 0;
 
@@ -328,6 +330,7 @@ static int display_info(request_rec *r)
                             "<font size=+1><tt>%s</tt></a></font>\n",
                             modp->name, modp->name);
                 ap_rputs("<dt><strong>Content handlers:</strong>", r);
+#ifdef NEVERMORE
                 hand = modp->handlers;
                 if (hand) {
                     while (hand) {
@@ -346,6 +349,9 @@ static int display_info(request_rec *r)
                 else {
                     ap_rputs("<tt> <EM>none</EM></tt>", r);
                 }
+#else
+                ap_rputs("<tt> <EM>(code broken)</EM></tt>", r);
+#endif
                 ap_rputs("<dt><strong>Configuration Phase Participation:</strong> \n",
                       r);
                 if (modp->create_dir_config) {
@@ -454,11 +460,10 @@ static const command_rec info_cmds[] =
     {NULL}
 };
 
-static const handler_rec info_handlers[] =
+static void register_hooks(void)
 {
-    {"server-info", display_info},
-    {NULL}
-};
+    ap_hook_handler(display_info, NULL, NULL, AP_HOOK_MIDDLE);
+}
 
 module AP_MODULE_DECLARE_DATA info_module =
 {
@@ -468,6 +473,5 @@ module AP_MODULE_DECLARE_DATA info_module =
     create_info_config,         /* server config */
     merge_info_config,          /* merge server config */
     info_cmds,                  /* command apr_table_t */
-    info_handlers,              /* handlers */
-    NULL,                       /* filename translation */
+    register_hooks
 };