httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject cvs commit: httpd-2.0/server config.c
Date Tue, 14 Oct 2003 03:43:18 GMT
stas        2003/10/13 20:43:18

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               server   Tag: APACHE_2_0_BRANCH config.c
  Log:
  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.
  Submitted by:	"Philippe M. Chiasson" <gozer@cpan.org>
  Reviewed by:	stas, jwoolley, trawick
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.171 +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.170
  retrieving revision 1.988.2.171
  diff -u -u -r1.988.2.170 -r1.988.2.171
  --- CHANGES	13 Oct 2003 19:18:21 -0000	1.988.2.170
  +++ CHANGES	14 Oct 2003 03:43:16 -0000	1.988.2.171
  @@ -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]
  
  
  
  1.751.2.499 +1 -10     httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.498
  retrieving revision 1.751.2.499
  diff -u -u -r1.751.2.498 -r1.751.2.499
  --- STATUS	13 Oct 2003 19:18:21 -0000	1.751.2.498
  +++ STATUS	14 Oct 2003 03:43:17 -0000	1.751.2.499
  @@ -260,15 +260,6 @@
           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,
  
  
  
  No                   revision
  No                   revision
  1.156.2.7 +3 -0      httpd-2.0/server/config.c
  
  Index: config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/config.c,v
  retrieving revision 1.156.2.6
  retrieving revision 1.156.2.7
  diff -u -u -r1.156.2.6 -r1.156.2.7
  --- config.c	17 Sep 2003 10:30:47 -0000	1.156.2.6
  +++ config.c	14 Oct 2003 03:43:18 -0000	1.156.2.7
  @@ -926,6 +926,9 @@
           if (*lastc == '>') {
               *lastc = '\0' ;
           }
  +        if (cmd_name[0] == '<' && *args == '\0') {
  +            args = ">";
  +        }
       }
   
       newdir = apr_pcalloc(p, sizeof(ap_directive_t));
  
  
  

Mime
View raw message