Make sure mod_rewrite always runs before mod_proxy in the translate_name hook. This...

Reported By: David D. Miller <justdave bugzilla.org>

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

diff --git a/CHANGES b/CHANGES
index 104caabefb9fd4cb39f76a254d834912c4f20510..3bae5e8615ca7e59f636f12a7b3f532e1a3c8aa5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.5
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_proxy: Run mod_rewrite beofre mod_proxy in the translate_name
+     hook. [Paul Querna]
+
   *) mod_authnz_ldap: Add the directive AuthLDAPAllowDNAuth to allow 
      a user to authenticate against an LDAP directory using a full 
      user DN. [Brad Nicholes]

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index f3ad42be2fbbb803a144270bb02621b92cd265fa..7f09042957f4b903d03ab6addbdd20539dc91179 100644 (file)
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -1813,7 +1813,7 @@ static void register_hooks(apr_pool_t *p)
     /* handler */
     ap_hook_handler(proxy_handler, NULL, NULL, APR_HOOK_FIRST);
     /* filename-to-URI translation */
-    ap_hook_translate_name(proxy_trans, NULL, NULL, APR_HOOK_FIRST);
+    ap_hook_translate_name(proxy_trans, aszSucc, 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 */