fix "Expected </Foo>> but saw </Foo>" errors in nested,

argumentless containers.

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

diff --git a/CHANGES b/CHANGES
index dcf9552c31068327bd7f3faf1d0e8b2a6a9f9806..08ac9f1eaf0a54cf4789e95e944ee19138a7cb04 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) fix "Expected </Foo>> but saw </Foo>" errors in nested,
+     argumentless containers.
+     ["Philippe M. Chiasson" <gozer cpan.org>]
+
   *) mod_isapi: GetServerVariable returned improperly terminated header 
      fields given "ALL_HTTP" or "ALL_RAW".  PR 20656.
      [Jesse Pelton <jsp pkc.com>]

diff --git a/server/config.c b/server/config.c
index 48fa546d93dabc0f05e0ad535d14c8440e954e50..d50cfae1a744f8b155b1c5b1ec221e65157c76fa 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -1287,6 +1287,10 @@ AP_DECLARE(const char *) ap_soak_end_container(cmd_parms *cmd, char *directive)
             else {
                 const char *msg;
 
+                if (*args == '\0' && cmd_name[strlen(cmd_name) - 1] == '>') {
+                    cmd_name[strlen(cmd_name) - 1] = '\0';
+                }
+
                 if ((msg = ap_soak_end_container(cmd, cmd_name)) != NULL) {
                     return msg;
                 }