From: Ryan Bloom <rbb@apache.org>
Date: Fri, 11 May 2001 23:33:46 +0000 (+0000)
Subject: Cleanup the reporting of incorrect end tags for container directives.
X-Git-Tag: 2.0.18~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5aba03766fb551cf148db74273fa21505d99bdb;p=thirdparty%2Fapache%2Fhttpd.git

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 fd31ee2d115..85112b5f05f 100644
--- 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 7af7b3f2d97..73b78def954 100644
--- 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;