summaryrefslogtreecommitdiffstats
path: root/modules/mappers
diff options
context:
space:
mode:
authorGraham Leggett <minfrin@apache.org>2009-10-05 22:56:48 +0200
committerGraham Leggett <minfrin@apache.org>2009-10-05 22:56:48 +0200
commiteded0f9d2d8dece33f1e3898c60ae6ea52c9478e (patch)
treec8f3af106ca4f7ef2e03b0a83f20ac677cc96c3d /modules/mappers
parentUpdate transformations. (diff)
downloadapache2-eded0f9d2d8dece33f1e3898c60ae6ea52c9478e.tar.xz
apache2-eded0f9d2d8dece33f1e3898c60ae6ea52c9478e.zip
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
Diffstat (limited to 'modules/mappers')
-rw-r--r--modules/mappers/mod_rewrite.c5
1 files changed, 4 insertions, 1 deletions
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;