summaryrefslogtreecommitdiffstats
path: root/modules/proxy/mod_proxy_balancer.c
diff options
context:
space:
mode:
authorRuediger Pluem <rpluem@apache.org>2008-05-29 22:12:58 +0200
committerRuediger Pluem <rpluem@apache.org>2008-05-29 22:12:58 +0200
commit6e450bc66063b43177b494af47f9be3d8686ac81 (patch)
tree9c8c979cf4afaa744542ca8dd09a4e19d4408310 /modules/proxy/mod_proxy_balancer.c
parent* Do not add the query string again in the case that we are using the (diff)
downloadapache2-6e450bc66063b43177b494af47f9be3d8686ac81.tar.xz
apache2-6e450bc66063b43177b494af47f9be3d8686ac81.zip
* 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
Diffstat (limited to '')
-rw-r--r--modules/proxy/mod_proxy_balancer.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index 0be4cff38c..eecfb9e8ce 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 */
}