From: Geoffrey Young <geoff@apache.org>
Date: Wed, 18 Feb 2004 22:24:12 +0000 (+0000)
Subject: fix "Expected </Foo>> but saw </Foo>" errors in nested,
X-Git-Tag: 2.0.49~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24d6cc621f3143d938749c0c7af4a6aa88b9c206;p=thirdparty%2Fapache%2Fhttpd.git

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


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

diff --git a/CHANGES b/CHANGES
index dff81bf84d3..76f4ced52a0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.49
 
+  *) fix "Expected </Foo>> but saw </Foo>" errors in nested,
+     argumentless containers.
+     ["Philippe M. Chiasson" <gozer cpan.org>]
+
   *) mod_auth_ldap: Fix some segfaults in the cache logic.  PR 18756.
      [Matthieu Estrade <apache moresecurity.org>, Brad Nicholes]
 
diff --git a/STATUS b/STATUS
index f138fd01c64..e15ec00ed31 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/02/18 20:33:09 $]
+Last modified at [$Date: 2004/02/18 22:24:11 $]
 
 Release:
 
@@ -80,11 +80,6 @@ PATCHES TO BACKPORT FROM 2.1
   [ please place file names and revisions from HEAD here, so it is easy to
     identify exactly what the proposed changes are! ]
 
-    * fix "Expected </Foo>> but saw </Foo>" errors in nested,
-      argumentless containers.
-      http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/config.c?r1=1.172&r2=1.173
-      +1: geoff, stas, trawick
-
     * mod_ssl: Clear OpenSSL error stack during pphrase entry to prevent 
       spurious failures in SSL functions later.
       PR: 21160
diff --git a/server/config.c b/server/config.c
index b359150181d..b99776a059a 100644
--- 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;
                 }