From: Ruediger Pluem <rpluem@apache.org>
Date: Thu, 29 May 2008 20:12:58 +0000 (+0000)
Subject: * Set at init time and combine comments.
X-Git-Tag: 2.3.0~564
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e450bc66063b43177b494af47f9be3d8686ac81;p=thirdparty%2Fapache%2Fhttpd.git

* Set at init time and combine comments.


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

diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index 0be4cff38c2..eecfb9e8cea 100644
--- a/modules/proxy/mod_proxy_balancer.c
+++ b/modules/proxy/mod_proxy_balancer.c
@@ -26,7 +26,8 @@ module AP_MODULE_DECLARE_DATA proxy_balancer_module;
 
 static int proxy_balancer_canon(request_rec *r, char *url)
 {
-    char *host, *path, *search;
+    char *host, *path;
+    char *search = NULL;
     const char *err;
     apr_port_t port = 0;
 
@@ -50,10 +51,11 @@ static int proxy_balancer_canon(request_rec *r, char *url)
                       url, err);
         return HTTP_BAD_REQUEST;
     }
-    /* now parse path/search args, according to rfc1738 */
-    search = NULL;
-
-    /* process path */
+    /*
+     * now parse path/search args, according to rfc1738:
+     * process the path. With proxy-noncanon set (by
+     * mod_proxy) we use the raw, unparsed uri
+     */
     if (apr_table_get(r->notes, "proxy-nocanon")) {
         path = url;   /* this is the raw path */
     }