www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-10 02:02:49 +03:00
Code Activity

mod_proxy: Don't canonicalize with both nocanon and ProxyPassInterpolateEnv On.

Browse Source 
If nocanon is set, we should match the unparsed_uri against the interpolated
alias (not the ProxyPass'ed one) when verifying the resulting length. Otherwise
we falsely restore the canonicalized URL in case of mismatch.  PR 65549.

Submitted by: Joel Self <joelself gmail.com>



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1893016 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2021-09-07 10:16:03 +00:00
parent 03442ed466
commit 22895e737d
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changes-entries/proxy_nocanon_interpolate.txt Normal file
View File

@@ -0,0 +1,3 @@
*) mod_proxy: Do not canonicalize the proxied URL when both "nocanon" and
"ProxyPassInterpolateEnv On" are configured. PR 65549.
[Joel Self <joelself gmail.com>]

2
modules/proxy/mod_proxy.c
View File

@@ -949,7 +949,7 @@ PROXY_DECLARE(int) ap_proxy_trans_match(request_rec *r, struct proxy_alias *ent,
"'%s'; declining", r->uri); "'%s'; declining", r->uri);
return DECLINED; return DECLINED;
} }
if (nocanon && len != alias_match(r->unparsed_uri, ent->fake)) { if (nocanon && len != alias_match(r->unparsed_uri, fake)) {
mismatch = 1; mismatch = 1;
use_uri = r->uri; use_uri = r->uri;
} }