httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/server util.c
Date Thu, 02 Sep 2004 19:49:21 GMT
trawick     2004/09/02 12:49:21

  Modified:    .        CHANGES
               server   util.c
  Log:
  handling of encoded non-slashes was borked in the
  AllowEncodedSlashes path
  
  thanks to FirstBill for pointing that out!
  
  Revision  Changes    Path
  1.1583    +1 -1      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1582
  retrieving revision 1.1583
  diff -u -r1.1582 -r1.1583
  --- CHANGES	2 Sep 2004 11:20:53 -0000	1.1582
  +++ CHANGES	2 Sep 2004 19:49:19 -0000	1.1583
  @@ -13,7 +13,7 @@
   
     *) Fix the handling of URIs containing %2F when AllowEncodedSlashes
        is enabled.  Previously, such urls would still be rejected with
  -     404.  [Jeff Trawick]
  +     404.  [Jeff Trawick, Bill Stoddard]
   
     *) mod_rewrite: Fix query string handling for proxied URLs. PR 14518.
        [michael teitler <michael.teitler cetelem.fr>,
  
  
  
  1.149     +2 -6      httpd-2.0/server/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/util.c,v
  retrieving revision 1.148
  retrieving revision 1.149
  diff -u -r1.148 -r1.149
  --- util.c	1 Sep 2004 15:14:33 -0000	1.148
  +++ util.c	2 Sep 2004 19:49:21 -0000	1.149
  @@ -1581,16 +1581,12 @@
               else {
                   char decoded;
                   decoded = x2c(y + 1);
  -                if (!IS_SLASH(decoded)) {
  -                    *x++ = *y++;
  -                    *x = *y;
  +                if (decoded == '\0') {
  +                    badpath = 1;
                   }
                   else {
                       *x = decoded;
                       y += 2;
  -                    if (decoded == '\0') {
  -                        badpath = 1;
  -                    }
                   }
               }
           }
  
  
  

Mime
View raw message