merge this fix into the stable branch:

     fix the config parser to support <Foo>..</Foo> containers (no
     arguments in the opening tag) supported by httpd 1.3. Without
     this change mod_perl 2.0's <Perl> sections are broken.
PR:
Obtained from:
Submitted by:	"Philippe M. Chiasson" <gozer@cpan.org>
Reviewed by:	stas, jwoolley, trawick

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

diff --git a/CHANGES b/CHANGES
index 98fbfd618587a805314ba5aadb280dbbfbcfcfd1..1b92501b39beb3fb112107565781b090eab56a76 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 Changes with Apache 2.0.48
 
+  *) fix the config parser to support <Foo>..</Foo> containers (no
+     arguments in the opening tag) supported by httpd 1.3. Without
+     this change mod_perl 2.0's <Perl> sections are broken.
+     ["Philippe M. Chiasson" <gozer@cpan.org>]
+
   *) mod_cgid: fix a hash table corruption problem which could
      result in the wrong script being cleaned up at the end of a
      request.  [Jeff Trawick]

diff --git a/STATUS b/STATUS
index fa8c8eedc836971828e186197afbb0a77ad7364c..e95e66f30d68a9ec14514c68ed39aa0bcbf8d52c 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/10/13 19:18:21 $]
+Last modified at [$Date: 2003/10/14 03:43:17 $]
 
 Release:
 
@@ -260,15 +260,6 @@ PATCHES TO BACKPORT FROM 2.1
         modules/generators/mod_info.c r1.151
       +1: trawick
 
-    * httpd-2.0's config parser is incompatible with httpd-1.3's one,
-      which allowed containers like <Perl>. httpd-2.0's config parser
-      doesn't like container directives with no arguments (Syntax
-      error on line nn of httpd.conf: <Perl> directive missing closing
-      '>'). This fix restores the support for <Foo>..</Foo> containers.
-        server/config.c: r1.167
-      +1: stas, jwoolley, trawick
-
-
 CURRENT RELEASE NOTES:
 
     * Backwards compatibility is expected of future Apache 2.0 releases,

diff --git a/server/config.c b/server/config.c
index a8e803a85584d3ddcdb729477dd45778635d9ca1..c1e36b91aee0d8d649ad572e460502bc0531aec5 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -926,6 +926,9 @@ static const char *ap_build_config_sub(apr_pool_t *p, apr_pool_t *temp_pool,
         if (*lastc == '>') {
             *lastc = '\0' ;
         }
+        if (cmd_name[0] == '<' && *args == '\0') {
+            args = ">";
+        }
     }
 
     newdir = apr_pcalloc(p, sizeof(ap_directive_t));