From eded0f9d2d8dece33f1e3898c60ae6ea52c9478e Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Mon, 5 Oct 2009 20:56:48 +0000 Subject: [PATCH] mod_rewrite: Make sure that a hostname:port isn't fully qualified if the request is a CONNECT request. Submitted by: Bill Zajac git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@822004 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ modules/mappers/mod_rewrite.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index a3e1ec325d..11c316d7b2 100644 --- 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 , Joe Orton] + *) mod_rewrite: Make sure that a hostname:port isn't fully qualified if + the request is a CONNECT request. [Bill Zajac ] + *) 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 b6c6620056..067e7c839e 100644 --- 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; -- 2.40.0