summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rw-r--r--modules/mappers/mod_rewrite.c5
2 files changed, 7 insertions, 1 deletions
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 <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 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;