Fix the handling of URIs containing %2F when AllowEncodedSlashes

is enabled.  Previously, such urls would still be rejected with
404.

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

diff --git a/CHANGES b/CHANGES
index 44ea2575ad749f3daee13f7c78fab01993e7d668..0d2491c8f2ad412291c5802cf5008c8dd5f2c8f0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Fix the handling of URIs containing %2F when AllowEncodedSlashes
+     is enabled.  Previously, such urls would still be rejected with
+     404.  [Jeff Trawick]
+
   *) mod_rewrite: Fix query string handling for proxied URLs. PR 14518.
      [michael teitler <michael.teitler cetelem.fr>,
       Jan Kratochvil <rcpt-dev.AT.httpd.apache.org jankratochvil.net>]

diff --git a/server/util.c b/server/util.c
index 23a968ee28785f34c72b359385c95f820d00ef11..24a878baeeed1f115c6afa9f309de331cf87ed03 100644 (file)
--- a/server/util.c
+++ b/server/util.c
@@ -1581,7 +1581,7 @@ AP_DECLARE(int) ap_unescape_url_keep2f(char *url)
             else {
                 char decoded;
                 decoded = x2c(y + 1);
-                if (IS_SLASH(decoded)) {
+                if (!IS_SLASH(decoded)) {
                     *x++ = *y++;
                     *x = *y;
                 }