You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ni...@apache.org on 2007/08/31 15:27:40 UTC

svn commit: r571456 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/proxy/proxy_util.c

Author: niq
Date: Fri Aug 31 06:27:39 2007
New Revision: 571456

URL: http://svn.apache.org/viewvc?rev=571456&view=rev
Log:
Backport fix to pr38448: don't URLencode tilde in path component.

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=571456&r1=571455&r2=571456&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Fri Aug 31 06:27:39 2007
@@ -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.

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=571456&r1=571455&r2=571456&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Aug 31 06:27:39 2007
@@ -190,11 +190,6 @@
       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

Modified: httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c?rev=571456&r1=571455&r2=571456&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c Fri Aug 31 06:27:39 2007
@@ -162,7 +162,7 @@
  * it only permits ; / ? : @ = & as reserved chars.)
  */
     if (t == enc_path) {
-        allowed = "$-_.+!*'(),;:@&=";
+        allowed = "~$-_.+!*'(),;:@&=";
     }
     else if (t == enc_search) {
         allowed = "$-_.!*'(),;:@&=";