mod_rewrite: Make sure that a hostname:port isn't fully qualified if

the request is a CONNECT request.
Submitted by: Bill Zajac <billz consultla.com>

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

diff --git a/CHANGES b/CHANGES
index a3e1ec325d61bb353001a02fc0fd778e33ae838d..11c316d7b2cbc830ddb7baf39dd3f308ca671151 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,9 @@ Changes with Apache 2.3.3
      mod_proxy_ftp: NULL pointer dereference on error paths.
      [Stefan Fritsch <sf fritsch.de>, Joe Orton]
 
+  *) mod_rewrite: Make sure that a hostname:port isn't fully qualified if
+     the request is a CONNECT request. [Bill Zajac <billz consultla.com>]
+
   *) mod_cache: Teach CacheEnable and CacheDisable to work from within a
      Location section, in line with how ProxyPass works. [Graham Leggett]
 

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index b6c6620056474dd5ce3d95808a5b8bbf0285fc41..067e7c839ef54827921b964d55e376326e0d49d5 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -870,7 +870,10 @@ static void reduce_uri(request_rec *r)
  */
 static void fully_qualify_uri(request_rec *r)
 {
-    if (!is_absolute_uri(r->filename)) {
+    if (r->method_number == M_CONNECT) {
+        return;
+    }
+    else if (!is_absolute_uri(r->filename)) {
         const char *thisserver;
         char *thisport;
         int port;