Make mod_proxy_ajp aware of the nocanon envvar

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

diff --git a/modules/proxy/mod_proxy_ajp.c b/modules/proxy/mod_proxy_ajp.c
index 47f07b12983eff7853d7369e2980f7920ab9f5d3..7213660d0f40262296607ebedaa0b1f9a74c2cbc 100644 (file)
--- a/modules/proxy/mod_proxy_ajp.c
+++ b/modules/proxy/mod_proxy_ajp.c
@@ -72,8 +72,13 @@ static int proxy_ajp_canon(request_rec *r, char *url)
         search = r->args;
 
     /* process path */
-    path = ap_proxy_canonenc(r->pool, url, strlen(url), enc_path, 0,
-                             r->proxyreq);
+    if (apr_table_get(r->notes, "proxy-nocanon")) {
+        path = url;   /* this is the raw path */
+    }
+    else {
+        path = ap_proxy_canonenc(r->pool, url, strlen(url), enc_path, 0,
+                                 r->proxyreq);
+    }
     if (path == NULL)
         return HTTP_BAD_REQUEST;