Fix mod_info, so that <Directory> and <Location> directives are

not displayed twice when displaying the current configuration.

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

diff --git a/CHANGES b/CHANGES
index 357fd78fd27b606effc57944acd7b6b4c76312b3..db0ac7be752056b9f6eee1fdeed2ddb33caa510e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.14-dev
 
+  *) Fix mod_info, so that <Directory> and <Location> directives are
+     not displayed twice when displaying the current configuration.
+     [Ryan Morgan <rmorgan@covalent.net>]
+
   *) Add config directives to override DEFAULT_ERROR_MSG and
      DEFAULT_TIME_FORMAT.  This was sent in as PR 6193.
      [Dan Rench <drench@xnet.com>]

diff --git a/modules/generators/mod_info.c b/modules/generators/mod_info.c
index f5287daa6e36bcc0aaef0f119f6c9ce8be2fa0e2..f01afbbfecc20c40a7ff4aa428a190b1a227425a 100644 (file)
--- a/modules/generators/mod_info.c
+++ b/modules/generators/mod_info.c
@@ -192,7 +192,8 @@ static void mod_info_module_cmds(request_rec * r, const command_rec * cmds,
     while (tmptree != NULL) {
        cmd = cmds;
        while (cmd->name) {
-           if (!strcasecmp(cmd->name, tmptree->directive)) {
+           if ((cmd->name[0] != '<') && 
+                (strcasecmp(cmd->name, tmptree->directive) == 0)) {
                if (nest > block_start) {
                    block_start++;
                    apr_snprintf(htmlstring, sizeof(htmlstring), "%s %s",