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

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

diff --git a/CHANGES b/CHANGES
index ffd805665b1e139d2063444276c5484306aa9fbb..737aa89d320aef3a5e57812da603e923f778100a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,11 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) 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 2856232b482cb3bc8bdec7bca1cd718cae68d5a5..56f1d2f809bf07e2a3bcc98f7394c326e9cbdc85 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.1 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/08/31 16:14:38 $]
+Last modified at [$Date: 2003/10/11 06:37:45 $]
 
 Release [NOTE that only Alpha/Beta releases occur in 2.1 development]:
 
@@ -30,6 +30,13 @@ RELEASE SHOWSTOPPERS:
 
 CURRENT VOTES:
 
+    * 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.
+      +1: stas
+
     * Promote mod_cache from experimental to non-experimental
       status (keep issues noted below in EXPERIMENTAL MODULES as
       items to be addressed as a supported module).

diff --git a/server/config.c b/server/config.c
index 9a8a72853341d2eaf87ec09016becaa7d230290a..7a3ccb03e2b174fa41f3287dcf0b72aa629ed561 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));