diff options
| author | Yann Ylavic <ylavic@apache.org> | 2024-09-11 17:30:08 +0200 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2024-09-11 17:30:08 +0200 |
| commit | c9dc4bb61befa4f3772de4aec0b892e728b94145 (patch) | |
| tree | 6444e3acec662cd397a7510d6087387ab1ddc954 /modules/proxy | |
| parent | mod_rewrite: Follow up to r1919325: Simplify QSLAST tracking. (diff) | |
| download | apache2-c9dc4bb61befa4f3772de4aec0b892e728b94145.tar.xz apache2-c9dc4bb61befa4f3772de4aec0b892e728b94145.zip | |
mod_rewrite, mod_proxy: mod_proxy to cononicalize rewritten [P] URLs. PR 69235.
When mod_rewrite sets a "proxy:" URL with [P], it should be canonicalized by
mod_proxy still, notably to handle any "unix:" local socket part.
To avoid double encoding in perdir context, a follow up commit should remove the
ap_escape_uri() done in mod_rewrite since it's now on mod_proxy to canonicalize,
per PR 69260.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1920570 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/proxy')
| -rw-r--r-- | modules/proxy/mod_proxy.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c index a4e7a1aed1..0cce98ddf1 100644 --- a/modules/proxy/mod_proxy.c +++ b/modules/proxy/mod_proxy.c @@ -3402,28 +3402,26 @@ static int proxy_pre_config(apr_pool_t *pconf, apr_pool_t *plog, } static void register_hooks(apr_pool_t *p) { - /* fixup before mod_rewrite, so that the proxied url will not - * escaped accidentally by our fixup. - */ - static const char * const aszSucc[] = { "mod_rewrite.c", NULL}; /* Only the mpm_winnt has child init hook handler. * make sure that we are called after the mpm * initializes. */ static const char *const aszPred[] = { "mpm_winnt.c", "mod_proxy_balancer.c", "mod_proxy_hcheck.c", NULL}; + static const char * const aszModRewrite[] = { "mod_rewrite.c", NULL }; /* handler */ ap_hook_handler(proxy_handler, NULL, NULL, APR_HOOK_FIRST); /* filename-to-URI translation */ ap_hook_pre_translate_name(proxy_pre_translate_name, NULL, NULL, APR_HOOK_MIDDLE); - ap_hook_translate_name(proxy_translate_name, aszSucc, NULL, + /* mod_rewrite has a say on the uri before proxy translation */ + ap_hook_translate_name(proxy_translate_name, aszModRewrite, NULL, APR_HOOK_FIRST); /* walk <Proxy > entries and suppress default TRACE behavior */ ap_hook_map_to_storage(proxy_map_location, NULL,NULL, APR_HOOK_FIRST); - /* fixups */ - ap_hook_fixups(proxy_fixup, NULL, aszSucc, APR_HOOK_FIRST); + /* fixup after mod_rewrite so that a [P] URL from there gets fixed up */ + ap_hook_fixups(proxy_fixup, aszModRewrite, NULL, APR_HOOK_FIRST); /* post read_request handling */ ap_hook_post_read_request(proxy_detect, NULL, NULL, APR_HOOK_FIRST); /* pre config handling */ |