Cleanup the reporting of incorrect end tags for container directives.

PR:	7617
Submitted by:	Barrie Slaymaker <barries@slaysys.com>

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

diff --git a/CHANGES b/CHANGES
index fd31ee2d1151de425f6adc7bb767845d384756c6..85112b5f05fe971415cd6cd2e3b3eec26bceefde 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.18-dev
 
+  *) Clean up the reporting of incorrect closing container tags.
+     [Barrie Slaymaker <barries@slaysys.com>]
+
   *) Simplify the configure process by moving all libtool stuff to APR
      and moving hints.m4 inline.  [Roy Fielding]
 

diff --git a/server/config.c b/server/config.c
index 7af7b3f2d977d119c19dac30048e1fd22862d003..73b78def9548a46786ff739821f461139fc9e1d1 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -809,6 +809,13 @@ static const char * ap_build_config_sub(apr_pool_t *p, apr_pool_t *temp_pool,
        return NULL;
     }
 
+    if ( cmd_name[1] != '/' ) {
+        char *lastc = cmd_name + strlen(cmd_name) - 1;
+        if (*lastc == '>') {
+            *lastc = '\0' ;
+        }
+    }
+
     newdir = apr_pcalloc(p, sizeof(ap_directive_t));
     newdir->filename = parms->config_file->name;
     newdir->line_num = parms->config_file->line_number;