Backport fix to pr38448: don't URLencode tilde in path component.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@571456 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index bbcf5d4d51a0c1ef6f1115100be42539919f8a80..4410df2eba2fd522507f57fa8f30e30518937639 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.6
 
+  *) mod_proxy: don't URLencode tilde in path component
+     PR 38448 [Stijn Hoop <stijn sandcat.nl>]
+
   *) proxy/ajp_header.c: Fixed header token string comparisons
      Matching of header tokens failed to include the trailing NIL byte
      and could misinterpret a longer header token for a shorter.

diff --git a/STATUS b/STATUS
index 9233fdab0431b6e1df04ceef057d2f8386b2149d..7500766e0f5953a169fce431095f6993d30684e8 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -190,11 +190,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       trawick says: The new directives should be documented in trunk,
           so that docs are available for backport at the same time.
 
-    *) proxy_util.c: Don't URLencode tilde in path component
-       PR 38448
-       http://svn.apache.org/viewvc?view=rev&revision=429879
-       +1: niq, rpluem, martin
-
    * ssl/ssl_engine_io.c: Fix SSL Protocol hexdumps for EBCDIC systems
      A conversion is required for mod_ssl to display the SSL protocol correctly
      on EBCDIC machines. Backport of rev. 349906

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 0894ce43e8413083b5f4cca578315fc4785dda8c..615da10472af5f5f36f103da20c750c6d1ae0932 100644 (file)
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -162,7 +162,7 @@ PROXY_DECLARE(char *)ap_proxy_canonenc(apr_pool_t *p, const char *x, int len,
  * it only permits ; / ? : @ = & as reserved chars.)
  */
     if (t == enc_path) {
-        allowed = "$-_.+!*'(),;:@&=";
+        allowed = "~$-_.+!*'(),;:@&=";
     }
     else if (t == enc_search) {
         allowed = "$-_.!*'(),;:@&=";