httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject cvs commit: httpd-2.0/server config.c
Date Wed, 18 Feb 2004 22:24:12 GMT
geoff       2004/02/18 14:24:12

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               server   Tag: APACHE_2_0_BRANCH config.c
  Log:
  fix "Expected </Foo>> but saw </Foo>" errors in nested,
  argumentless containers.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.241 +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.240
  retrieving revision 1.988.2.241
  diff -u -r1.988.2.240 -r1.988.2.241
  --- CHANGES	11 Feb 2004 18:07:44 -0000	1.988.2.240
  +++ CHANGES	18 Feb 2004 22:24:10 -0000	1.988.2.241
  @@ -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]
   
  
  
  
  1.751.2.692 +1 -6      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.691
  retrieving revision 1.751.2.692
  diff -u -r1.751.2.691 -r1.751.2.692
  --- STATUS	18 Feb 2004 20:33:09 -0000	1.751.2.691
  +++ STATUS	18 Feb 2004 22:24:11 -0000	1.751.2.692
  @@ -80,11 +80,6 @@
     [ 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
  
  
  
  No                   revision
  No                   revision
  1.156.2.14 +4 -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.13
  retrieving revision 1.156.2.14
  diff -u -r1.156.2.13 -r1.156.2.14
  --- config.c	9 Feb 2004 20:59:45 -0000	1.156.2.13
  +++ config.c	18 Feb 2004 22:24:12 -0000	1.156.2.14
  @@ -1287,6 +1287,10 @@
               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;
                   }
  
  
  

Mime
View raw message