handling of encoded non-slashes was borked in the

AllowEncodedSlashes path

thanks to FirstBill for pointing that out!

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

diff --git a/CHANGES b/CHANGES
index 17430941ca6a48e9721c962145712e0a681ff6a7..a412477759cdeecaeacbac16cfb5c3b979a83176 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -13,7 +13,7 @@ Changes with Apache 2.1.0-dev
 
   *) 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>,

diff --git a/server/util.c b/server/util.c
index 24a878baeeed1f115c6afa9f309de331cf87ed03..231bc9adb9f524e578756d96bb2441497368e999 100644 (file)
--- a/server/util.c
+++ b/server/util.c
@@ -1581,16 +1581,12 @@ AP_DECLARE(int) ap_unescape_url_keep2f(char *url)
             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;
-                    }
                 }
             }
         }