httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject cvs commit: httpd-2.0/modules/generators mod_info.c
Date Sun, 05 Sep 2004 01:43:03 GMT
pquerna     2004/09/04 18:43:03

  Modified:    modules/generators mod_info.c
  Log:
  No Functional Changes to mod_info.
  
  This is purely a style cleanup for mod_info.
  
  I plan on making more functional changes later.
  
  Revision  Changes    Path
  1.58      +241 -200  httpd-2.0/modules/generators/mod_info.c
  
  Index: mod_info.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_info.c,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- mod_info.c	3 Sep 2004 02:31:06 -0000	1.57
  +++ mod_info.c	5 Sep 2004 01:43:03 -0000	1.58
  @@ -64,74 +64,87 @@
   #include "apr_want.h"
   #include "ap_mpm.h"
   
  -typedef struct {
  -    const char *name;                 /* matching module name */
  -    const char *info;                 /* additional info */
  +typedef struct
  +{
  +    const char *name;           /* matching module name */
  +    const char *info;           /* additional info */
   } info_entry;
   
  -typedef struct {
  +typedef struct
  +{
       apr_array_header_t *more_info;
   } info_svr_conf;
   
   module AP_MODULE_DECLARE_DATA info_module;
   
  -static void *create_info_config(apr_pool_t *p, server_rec *s)
  +static void *create_info_config(apr_pool_t * p, server_rec *s)
   {
  -    info_svr_conf *conf = (info_svr_conf *) apr_pcalloc(p, sizeof(info_svr_conf));
  +    info_svr_conf *conf =
  +        (info_svr_conf *) apr_pcalloc(p, sizeof(info_svr_conf));
   
       conf->more_info = apr_array_make(p, 20, sizeof(info_entry));
       return conf;
   }
   
  -static void *merge_info_config(apr_pool_t *p, void *basev, void *overridesv)
  +static void *merge_info_config(apr_pool_t * p, void *basev, void *overridesv)
   {
  -    info_svr_conf *new = (info_svr_conf *) apr_pcalloc(p, sizeof(info_svr_conf));
  +    info_svr_conf *new =
  +        (info_svr_conf *) apr_pcalloc(p, sizeof(info_svr_conf));
       info_svr_conf *base = (info_svr_conf *) basev;
       info_svr_conf *overrides = (info_svr_conf *) overridesv;
   
  -    new->more_info = apr_array_append(p, overrides->more_info, base->more_info);
  +    new->more_info =
  +        apr_array_append(p, overrides->more_info, base->more_info);
       return new;
   }
   
  -static void mod_info_indent(request_rec * r, int nest, const char* thisfn, int linenum)
  +static void mod_info_indent(request_rec *r, int nest, const char *thisfn,
  +                            int linenum)
   {
       int i;
  -    const char *prevfn = ap_get_module_config(r->request_config, &info_module);
  +    const char *prevfn =
  +        ap_get_module_config(r->request_config, &info_module);
       char buf[32];
  -    if (thisfn == NULL) thisfn = "*UNKNOWN*";
  +    if (thisfn == NULL)
  +        thisfn = "*UNKNOWN*";
       if (prevfn == NULL || 0 != strcmp(prevfn, thisfn)) {
           thisfn = ap_escape_html(r->pool, thisfn);
  -        ap_rprintf(r, "<dd><tt><strong>In file: %s</strong></tt></dd>\n",
thisfn);
  +        ap_rprintf(r, "<dd><tt><strong>In file: %s</strong></tt></dd>\n",
  +                   thisfn);
           ap_set_module_config(r->request_config, &info_module, thisfn);
       }
       ap_rputs("<dd><tt>", r);
  -    if (linenum > 0) sprintf(buf, "%d", linenum);
  -    else             buf[0] = '\0';
  -    for (i = strlen(buf); i < 4; ++i) ap_rputs("&nbsp;", r);
  +    if (linenum > 0)
  +        sprintf(buf, "%d", linenum);
  +    else
  +        buf[0] = '\0';
  +    for (i = strlen(buf); i < 4; ++i)
  +        ap_rputs("&nbsp;", r);
       ap_rputs(buf, r);
       ap_rputs(":&nbsp;", r);
  -    for (i = 1; i <= nest; ++i) ap_rputs("&nbsp;&nbsp;", r);
  +    for (i = 1; i <= nest; ++i)
  +        ap_rputs("&nbsp;&nbsp;", r);
   }
   
  -static void mod_info_show_cmd(request_rec * r, const ap_directive_t * dir,
  -                                int nest)
  +static void mod_info_show_cmd(request_rec *r, const ap_directive_t * dir,
  +                              int nest)
   {
       mod_info_indent(r, nest, dir->filename, dir->line_num);
       ap_rprintf(r, "%s <i>%s</i></tt></dd>\n",
  -        ap_escape_html(r->pool, dir->directive),
  -        ap_escape_html(r->pool, dir->args));
  +               ap_escape_html(r->pool, dir->directive),
  +               ap_escape_html(r->pool, dir->args));
   }
   
  -static void mod_info_show_open(request_rec * r, const ap_directive_t * dir,
  -                                int nest)
  +static void mod_info_show_open(request_rec *r, const ap_directive_t * dir,
  +                               int nest)
   {
       mod_info_indent(r, nest, dir->filename, dir->line_num);
  -    ap_rprintf(r, "%s %s</tt></dd>\n", 
  -                  ap_escape_html(r->pool, dir->directive),
  -                  ap_escape_html(r->pool, dir->args));
  +    ap_rprintf(r, "%s %s</tt></dd>\n",
  +               ap_escape_html(r->pool, dir->directive),
  +               ap_escape_html(r->pool, dir->args));
   }
   
  -static void mod_info_show_close(request_rec * r, const ap_directive_t * dir,
  +static void mod_info_show_close(request_rec *r, const ap_directive_t * dir,
                                   int nest)
   {
       const char *dirname = dir->directive;
  @@ -139,58 +152,64 @@
       if (*dirname == '<') {
           ap_rprintf(r, "&lt;/%s&gt;</tt></dd>",
                      ap_escape_html(r->pool, dirname + 1));
  -            }
  -            else {
  -        ap_rprintf(r, "/%s</tt></dd>",
  -                   ap_escape_html(r->pool, dirname));
  -            }
  +    }
  +    else {
  +        ap_rprintf(r, "/%s</tt></dd>", ap_escape_html(r->pool, dirname));
  +    }
   }
  -    
  -static int mod_info_has_cmd(const command_rec * cmds, ap_directive_t * dir)
  +
  +static int mod_info_has_cmd(const command_rec *cmds, ap_directive_t * dir)
   {
  -    const command_rec * cmd;
  -    if (cmds == NULL) return 1;
  +    const command_rec *cmd;
  +    if (cmds == NULL)
  +        return 1;
       for (cmd = cmds; cmd->name; ++cmd) {
  -        if (strcasecmp(cmd->name, dir->directive) == 0) return 1;
  -	}
  +        if (strcasecmp(cmd->name, dir->directive) == 0)
  +            return 1;
  +    }
       return 0;
   }
   
  -static void mod_info_show_parents(request_rec * r, ap_directive_t * node, 
  -                                    int from, int to) {
  -    if (from < to) mod_info_show_parents(r, node->parent, from, to - 1);
  +static void mod_info_show_parents(request_rec *r, ap_directive_t * node,
  +                                  int from, int to)
  +{
  +    if (from < to)
  +        mod_info_show_parents(r, node->parent, from, to - 1);
       mod_info_show_open(r, node, to);
   }
   
  -static int mod_info_module_cmds(request_rec * r, const command_rec * cmds,
  +static int mod_info_module_cmds(request_rec *r, const command_rec *cmds,
                                   ap_directive_t * node, int from, int level)
   {
       int shown = from;
  -    ap_directive_t * dir;
  -    if (level == 0) ap_set_module_config(r->request_config, &info_module, NULL);
  +    ap_directive_t *dir;
  +    if (level == 0)
  +        ap_set_module_config(r->request_config, &info_module, NULL);
       for (dir = node; dir; dir = dir->next) {
           if (dir->first_child != NULL) {
               if (level < mod_info_module_cmds(r, cmds, dir->first_child,
  -                                                 shown, level + 1)) {
  +                                             shown, level + 1)) {
                   shown = level;
                   mod_info_show_close(r, dir, level);
               }
  -        } else if (mod_info_has_cmd(cmds, dir)) {
  +        }
  +        else if (mod_info_has_cmd(cmds, dir)) {
               if (shown < level) {
                   mod_info_show_parents(r, dir->parent, shown, level - 1);
                   shown = level;
               }
               mod_info_show_cmd(r, dir, level);
  -    }
  +        }
       }
       return shown;
   }
   
  -typedef struct { /*XXX: should get something from apr_hooks.h instead */
  -    void (*pFunc)(void); /* just to get the right size */
  +typedef struct
  +{                               /*XXX: should get something from apr_hooks.h instead */
  +    void (*pFunc) (void);       /* just to get the right size */
       const char *szName;
  -    const char * const *aszPredecessors;
  -    const char * const *aszSuccessors;
  +    const char *const *aszPredecessors;
  +    const char *const *aszSuccessors;
       int nOrder;
   } hook_struct_t;
   
  @@ -200,13 +219,14 @@
    * is required to account for the fact that the ap_hook* calls all use
    * STDCALL calling convention. 
    */
  -typedef apr_array_header_t * ( 
  +typedef apr_array_header_t *(
   #ifdef WIN32
  -__stdcall 
  +                                __stdcall
   #endif
  -* hook_get_t)(void);
  +                                * hook_get_t)      (void);
   
  -typedef struct {
  +typedef struct
  +{
       const char *name;
       hook_get_t get;
   } hook_lookup_t;
  @@ -224,8 +244,7 @@
       {NULL},
   };
   
  -static int module_find_hook(module *modp,
  -                            hook_get_t hook_get)
  +static int module_find_hook(module *modp, hook_get_t hook_get)
   {
       int i;
       apr_array_header_t *hooks = hook_get();
  @@ -235,9 +254,9 @@
           return 0;
       }
   
  -    elts = (hook_struct_t *)hooks->elts;
  +    elts = (hook_struct_t *) hooks->elts;
   
  -    for (i=0; i< hooks->nelts; i++) {
  +    for (i = 0; i < hooks->nelts; i++) {
           if (strcmp(elts[i].szName, modp->name) == 0) {
               return 1;
           }
  @@ -248,8 +267,7 @@
   
   static void module_participate(request_rec *r,
                                  module *modp,
  -                               hook_lookup_t *lookup,
  -                               int *comma)
  +                               hook_lookup_t * lookup, int *comma)
   {
       if (module_find_hook(modp, lookup->get)) {
           if (*comma) {
  @@ -262,11 +280,11 @@
   
   static void module_request_hook_participate(request_rec *r, module *modp)
   {
  -    int i, comma=0;
  +    int i, comma = 0;
   
       ap_rputs("<dt><strong>Request Phase Participation:</strong>\n", r);
   
  -    for (i=0; request_hooks[i].name; i++) {
  +    for (i = 0; request_hooks[i].name; i++) {
           module_participate(r, modp, &request_hooks[i], &comma);
       }
   
  @@ -279,8 +297,9 @@
   static const char *find_more_info(server_rec *s, const char *module_name)
   {
       int i;
  -    info_svr_conf *conf = (info_svr_conf *) ap_get_module_config(s->module_config,
  -                                                              &info_module);
  +    info_svr_conf *conf =
  +        (info_svr_conf *) ap_get_module_config(s->module_config,
  +                                               &info_module);
       info_entry *entry = (info_entry *) conf->more_info->elts;
   
       if (!module_name) {
  @@ -311,18 +330,21 @@
   
       r->allowed |= (AP_METHOD_BIT << M_GET);
       if (r->method_number != M_GET)
  -	return DECLINED;
  +        return DECLINED;
   
       ap_set_content_type(r, "text/html");
   
       ap_rputs(DOCTYPE_HTML_3_2
  -	     "<html><head><title>Server Information</title></head>\n",
r);
  -    ap_rputs("<body><h1 align=\"center\">Apache Server Information</h1>\n",
r);
  +             "<html><head><title>Server Information</title></head>\n",
r);
  +    ap_rputs("<body><h1 align=\"center\">Apache Server Information</h1>\n",
  +             r);
       if (!r->args || strcasecmp(r->args, "list")) {
           if (!r->args) {
  -            ap_rputs("<dl><dt><tt><a href=\"#server\">Server Settings</a>,
", r);
  +            ap_rputs("<dl><dt><tt><a href=\"#server\">Server Settings</a>,
",
  +                     r);
               for (modp = ap_top_module; modp; modp = modp->next) {
  -                ap_rprintf(r, "<a href=\"#%s\">%s</a>", modp->name, modp->name);
  +                ap_rprintf(r, "<a href=\"#%s\">%s</a>", modp->name,
  +                           modp->name);
                   if (modp->next) {
                       ap_rputs(", ", r);
                   }
  @@ -333,35 +355,44 @@
           if (!r->args || !strcasecmp(r->args, "server")) {
               int max_daemons, forked, threaded;
   
  -            ap_rprintf(r, "<dl><dt><a name=\"server\"><strong>Server
Version:</strong> "
  -                        "<font size=\"+1\"><tt>%s</tt></font></a></dt>\n",
  -                        ap_get_server_version());
  -            ap_rprintf(r, "<dt><strong>Server Built:</strong> "
  -                        "<font size=\"+1\"><tt>%s</tt></font></dt>\n",
  -                        ap_get_server_built());
  -            ap_rprintf(r, "<dt><strong>API Version:</strong> "
  -                        "<tt>%d:%d</tt></dt>\n",
  -                        MODULE_MAGIC_NUMBER_MAJOR, MODULE_MAGIC_NUMBER_MINOR);
  -            ap_rprintf(r, "<dt><strong>Hostname/port:</strong> "
  -                        "<tt>%s:%u</tt></dt>\n",
  -                        ap_get_server_name(r), ap_get_server_port(r));
  -            ap_rprintf(r, "<dt><strong>Timeouts:</strong> "
  -                        "<tt>connection: %d &nbsp;&nbsp; "
  -                        "keep-alive: %d</tt></dt>",
  -                        (int)(apr_time_sec(serv->timeout)), 
  -                        (int)(apr_time_sec(serv->timeout)));
  +            ap_rprintf(r,
  +                       "<dl><dt><a name=\"server\"><strong>Server
Version:</strong> "
  +                       "<font size=\"+1\"><tt>%s</tt></font></a></dt>\n",
  +                       ap_get_server_version());
  +            ap_rprintf(r,
  +                       "<dt><strong>Server Built:</strong> "
  +                       "<font size=\"+1\"><tt>%s</tt></font></dt>\n",
  +                       ap_get_server_built());
  +            ap_rprintf(r,
  +                       "<dt><strong>API Version:</strong> "
  +                       "<tt>%d:%d</tt></dt>\n", MODULE_MAGIC_NUMBER_MAJOR,
  +                       MODULE_MAGIC_NUMBER_MINOR);
  +            ap_rprintf(r,
  +                       "<dt><strong>Hostname/port:</strong> "
  +                       "<tt>%s:%u</tt></dt>\n", ap_get_server_name(r),
  +                       ap_get_server_port(r));
  +            ap_rprintf(r,
  +                       "<dt><strong>Timeouts:</strong> "
  +                       "<tt>connection: %d &nbsp;&nbsp; "
  +                       "keep-alive: %d</tt></dt>",
  +                       (int) (apr_time_sec(serv->timeout)),
  +                       (int) (apr_time_sec(serv->timeout)));
               ap_mpm_query(AP_MPMQ_MAX_DAEMON_USED, &max_daemons);
               ap_mpm_query(AP_MPMQ_IS_THREADED, &threaded);
               ap_mpm_query(AP_MPMQ_IS_FORKED, &forked);
  -            ap_rprintf(r, "<dt><strong>MPM Name:</strong> <tt>%s</tt></dt>\n",
ap_show_mpm());
  -            ap_rprintf(r, "<dt><strong>MPM Information:</strong> "
  -		       "<tt>Max Daemons: %d Threaded: %s Forked: %s</tt></dt>\n",
  +            ap_rprintf(r, "<dt><strong>MPM Name:</strong> <tt>%s</tt></dt>\n",
  +                       ap_show_mpm());
  +            ap_rprintf(r,
  +                       "<dt><strong>MPM Information:</strong> "
  +                       "<tt>Max Daemons: %d Threaded: %s Forked: %s</tt></dt>\n",
                          max_daemons, threaded ? "yes" : "no",
                          forked ? "yes" : "no");
  -            ap_rprintf(r, "<dt><strong>Server Root:</strong> "
  -                        "<tt>%s</tt></dt>\n", ap_server_root);
  -            ap_rprintf(r, "<dt><strong>Config File:</strong> "
  -		       "<tt>%s</tt></dt>\n", ap_conftree->filename);
  +            ap_rprintf(r,
  +                       "<dt><strong>Server Root:</strong> "
  +                       "<tt>%s</tt></dt>\n", ap_server_root);
  +            ap_rprintf(r,
  +                       "<dt><strong>Config File:</strong> "
  +                       "<tt>%s</tt></dt>\n", ap_conftree->filename);
               ap_rputs("</dl><hr />", r);
           }
           if (r->args && 0 == strcasecmp(r->args, "config")) {
  @@ -370,117 +401,128 @@
               ap_rputs("</dl><hr />", r);
           }
           else {
  -        for (modp = ap_top_module; modp; modp = modp->next) {
  -            if (!r->args || !strcasecmp(modp->name, r->args)) {
  -                ap_rprintf(r, "<dl><dt><a name=\"%s\"><strong>Module
Name:</strong> "
  -                            "<font size=\"+1\"><tt>%s</tt></font></a></dt>\n",
  -                            modp->name, modp->name);
  -                ap_rputs("<dt><strong>Content handlers:</strong> ", r);
  +            for (modp = ap_top_module; modp; modp = modp->next) {
  +                if (!r->args || !strcasecmp(modp->name, r->args)) {
  +                    ap_rprintf(r,
  +                               "<dl><dt><a name=\"%s\"><strong>Module
Name:</strong> "
  +                               "<font size=\"+1\"><tt>%s</tt></font></a></dt>\n",
  +                               modp->name, modp->name);
  +                    ap_rputs("<dt><strong>Content handlers:</strong>
", r);
   #ifdef NEVERMORE
  -                hand = modp->handlers;
  -                if (hand) {
  -                    while (hand) {
  -                        if (hand->content_type) {
  -                            ap_rprintf(r, " <tt>%s</tt>\n", hand->content_type);
  -                        }
  -                        else {
  -                            break;
  -                        }
  -                        hand++;
  -                        if (hand && hand->content_type) {
  -                            ap_rputs(",", r);
  +                    hand = modp->handlers;
  +                    if (hand) {
  +                        while (hand) {
  +                            if (hand->content_type) {
  +                                ap_rprintf(r, " <tt>%s</tt>\n",
  +                                           hand->content_type);
  +                            }
  +                            else {
  +                                break;
  +                            }
  +                            hand++;
  +                            if (hand && hand->content_type) {
  +                                ap_rputs(",", r);
  +                            }
                           }
                       }
  -                }
  -                else {
  -                    ap_rputs("<tt> <em>none</em></tt>", r);
  -                }
  +                    else {
  +                        ap_rputs("<tt> <em>none</em></tt>", r);
  +                    }
   #else
  -                if (module_find_hook(modp, ap_hook_get_handler)) {
  -                    ap_rputs("<tt> <em>yes</em></tt>", r);
  -                }
  -                else {
  -                    ap_rputs("<tt> <em>none</em></tt>", r);
  -                }
  +                    if (module_find_hook(modp, ap_hook_get_handler)) {
  +                        ap_rputs("<tt> <em>yes</em></tt>", r);
  +                    }
  +                    else {
  +                        ap_rputs("<tt> <em>none</em></tt>", r);
  +                    }
   #endif
  -                ap_rputs("</dt>", r);
  -                ap_rputs("<dt><strong>Configuration Phase Participation:</strong>\n",
  -                      r);
  -                if (modp->create_dir_config) {
  -                    if (comma) {
  -                        ap_rputs(", ", r);
  +                    ap_rputs("</dt>", r);
  +                    ap_rputs
  +                        ("<dt><strong>Configuration Phase Participation:</strong>\n",
  +                         r);
  +                    if (modp->create_dir_config) {
  +                        if (comma) {
  +                            ap_rputs(", ", r);
  +                        }
  +                        ap_rputs("<tt>Create Directory Config</tt>", r);
  +                        comma = 1;
                       }
  -                    ap_rputs("<tt>Create Directory Config</tt>", r);
  -                    comma = 1;
  -                }
  -                if (modp->merge_dir_config) {
  -                    if (comma) {
  -                        ap_rputs(", ", r);
  +                    if (modp->merge_dir_config) {
  +                        if (comma) {
  +                            ap_rputs(", ", r);
  +                        }
  +                        ap_rputs("<tt>Merge Directory Configs</tt>", r);
  +                        comma = 1;
                       }
  -                    ap_rputs("<tt>Merge Directory Configs</tt>", r);
  -                    comma = 1;
  -                }
  -                if (modp->create_server_config) {
  -                    if (comma) {
  -                        ap_rputs(", ", r);
  +                    if (modp->create_server_config) {
  +                        if (comma) {
  +                            ap_rputs(", ", r);
  +                        }
  +                        ap_rputs("<tt>Create Server Config</tt>", r);
  +                        comma = 1;
                       }
  -                    ap_rputs("<tt>Create Server Config</tt>", r);
  -                    comma = 1;
  -                }
  -                if (modp->merge_server_config) {
  -                    if (comma) {
  -                        ap_rputs(", ", r);
  +                    if (modp->merge_server_config) {
  +                        if (comma) {
  +                            ap_rputs(", ", r);
  +                        }
  +                        ap_rputs("<tt>Merge Server Configs</tt>", r);
  +                        comma = 1;
                       }
  -                    ap_rputs("<tt>Merge Server Configs</tt>", r);
  -                    comma = 1;
  -                }
  -                if (!comma)
  -                    ap_rputs("<tt> <em>none</em></tt>", r);
  -                comma = 0;
  -                ap_rputs("</dt>", r);
  -
  -                module_request_hook_participate(r, modp);
  -
  -                cmd = modp->cmds;
  -                if (cmd) {
  -                    ap_rputs("<dt><strong>Module Directives:</strong></dt>",
r);
  -                    while (cmd) {
  -                        if (cmd->name) {
  -                            ap_rprintf(r, "<dd><tt>%s%s - <i>",
  -                                ap_escape_html(r->pool, cmd->name),
  -                                cmd->name[0] == '<' ? "&gt;" : "");
  -                            if (cmd->errmsg) {
  -                                ap_rputs(cmd->errmsg, r);
  +                    if (!comma)
  +                        ap_rputs("<tt> <em>none</em></tt>", r);
  +                    comma = 0;
  +                    ap_rputs("</dt>", r);
  +
  +                    module_request_hook_participate(r, modp);
  +
  +                    cmd = modp->cmds;
  +                    if (cmd) {
  +                        ap_rputs
  +                            ("<dt><strong>Module Directives:</strong></dt>",
  +                             r);
  +                        while (cmd) {
  +                            if (cmd->name) {
  +                                ap_rprintf(r, "<dd><tt>%s%s - <i>",
  +                                           ap_escape_html(r->pool, cmd->name),
  +                                           cmd->name[0] == '<' ? "&gt;" : "");
  +                                if (cmd->errmsg) {
  +                                    ap_rputs(cmd->errmsg, r);
  +                                }
  +                                ap_rputs("</i></tt></dd>\n", r);
                               }
  -                            ap_rputs("</i></tt></dd>\n", r);
  -                        }
  -                        else {
  -                            break;
  +                            else {
  +                                break;
  +                            }
  +                            cmd++;
                           }
  -                        cmd++;
  +                        ap_rputs
  +                            ("<dt><strong>Current Configuration:</strong></dt>\n",
  +                             r);
  +                        mod_info_module_cmds(r, modp->cmds, ap_conftree, 0,
  +                                             0);
  +                    }
  +                    else {
  +                        ap_rputs
  +                            ("<dt><strong>Module Directives:</strong>
<tt>none</tt></dt>",
  +                             r);
  +                    }
  +                    more_info = find_more_info(serv, modp->name);
  +                    if (more_info) {
  +                        ap_rputs
  +                            ("<dt><strong>Additional Information:</strong>\n</dt><dd>",
  +                             r);
  +                        ap_rputs(more_info, r);
  +                        ap_rputs("</dd>", r);
  +                    }
  +                    ap_rputs("</dl><hr />\n", r);
  +                    if (r->args) {
  +                        break;
                       }
  -                    ap_rputs("<dt><strong>Current Configuration:</strong></dt>\n",
r);
  -                    mod_info_module_cmds(r, modp->cmds, ap_conftree, 0, 0);
  -                }
  -                else {
  -                    ap_rputs("<dt><strong>Module Directives:</strong>
<tt>none</tt></dt>", r);
  -                }
  -                more_info = find_more_info(serv, modp->name);
  -                if (more_info) {
  -                    ap_rputs("<dt><strong>Additional Information:</strong>\n</dt><dd>",
  -                          r);
  -                    ap_rputs(more_info, r);
  -                    ap_rputs("</dd>", r);
  -                }
  -                ap_rputs("</dl><hr />\n", r);
  -                if (r->args) {
  -                    break;
                   }
               }
  -        }
  -        if (!modp && r->args && strcasecmp(r->args, "server")) {
  -            ap_rputs("<p><b>No such module</b></p>\n", r);
  -        }
  +            if (!modp && r->args && strcasecmp(r->args, "server"))
{
  +                ap_rputs("<p><b>No such module</b></p>\n", r);
  +            }
           }
       }
       else {
  @@ -492,18 +534,19 @@
           }
           ap_rputs("</dl><hr />", r);
       }
  -    ap_rputs(ap_psignature("",r), r);
  +    ap_rputs(ap_psignature("", r), r);
       ap_rputs("</body></html>\n", r);
       /* Done, turn off timeout, close file and return */
       return 0;
   }
   
  -static const char *add_module_info(cmd_parms *cmd, void *dummy, 
  +static const char *add_module_info(cmd_parms *cmd, void *dummy,
                                      const char *name, const char *info)
   {
       server_rec *s = cmd->server;
  -    info_svr_conf *conf = (info_svr_conf *) ap_get_module_config(s->module_config,
  -                                                              &info_module);
  +    info_svr_conf *conf =
  +        (info_svr_conf *) ap_get_module_config(s->module_config,
  +                                               &info_module);
       info_entry *new = apr_array_push(conf->more_info);
   
       new->name = name;
  @@ -511,20 +554,18 @@
       return NULL;
   }
   
  -static const command_rec info_cmds[] =
  -{
  +static const command_rec info_cmds[] = {
       AP_INIT_TAKE2("AddModuleInfo", add_module_info, NULL, RSRC_CONF,
                     "a module name and additional information on that module"),
       {NULL}
   };
   
  -static void register_hooks(apr_pool_t *p)
  +static void register_hooks(apr_pool_t * p)
   {
       ap_hook_handler(display_info, NULL, NULL, APR_HOOK_MIDDLE);
   }
   
  -module AP_MODULE_DECLARE_DATA info_module =
  -{
  +module AP_MODULE_DECLARE_DATA info_module = {
       STANDARD20_MODULE_STUFF,
       NULL,                       /* dir config creater */
       NULL,                       /* dir merger --- default is to override */
  
  
  

Mime
View raw message