Reverse the hook ordering for mod_userdir and mod_alias so

that Alias/ScriptAlias will override Userdir.

PR: 8841
Reviewed by:	Justin Erenkrantz

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

diff --git a/CHANGES b/CHANGES
index 3bcd6dc1daa45347978fc62a1eb52af839bccffe..ff0f09a72fa79015507d0f1525fe0a58d18734f3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.37
 
+  *) Reverse the hook ordering for mod_userdir and mod_alias so
+     that Alias/ScriptAlias will override Userdir.  PR 8841
+     [Joshua Slive]
+
   *) Move mod_deflate out of experimental and into filters.
      [Justin Erenkrantz]
 

diff --git a/modules/mappers/mod_alias.c b/modules/mappers/mod_alias.c
index 11e974ec0775a18cf5bf7d574a30e9e4d886b39c..e21f836e645322df4134b4f2be3df726a8adf95d 100644 (file)
--- a/modules/mappers/mod_alias.c
+++ b/modules/mappers/mod_alias.c
@@ -467,9 +467,9 @@ static int fixup_redir(request_rec *r)
 
 static void register_hooks(apr_pool_t *p)
 {
-    static const char * const aszPre[]={ "mod_userdir.c",NULL };
+    static const char * const aszSucc[]={ "mod_userdir.c",NULL };
 
-    ap_hook_translate_name(translate_alias_redir,aszPre,NULL,APR_HOOK_MIDDLE);
+    ap_hook_translate_name(translate_alias_redir,NULL,aszSucc,APR_HOOK_MIDDLE);
     ap_hook_fixups(fixup_redir,NULL,NULL,APR_HOOK_MIDDLE);
 }
 

diff --git a/modules/mappers/mod_userdir.c b/modules/mappers/mod_userdir.c
index 0b035894a1e2d2e8b4aca2ec3e446857bb65a44e..19408ee0c84474666e97ed4ff68511b257a01b78 100644 (file)
--- a/modules/mappers/mod_userdir.c
+++ b/modules/mappers/mod_userdir.c
@@ -392,9 +392,9 @@ static ap_unix_identity_t *get_suexec_id_doer(const request_rec *r)
 
 static void register_hooks(apr_pool_t *p)
 {
-    static const char * const aszSucc[]={ "mod_alias.c",NULL };
+    static const char * const aszPre[]={ "mod_alias.c",NULL };
 
-    ap_hook_translate_name(translate_userdir,NULL,aszSucc,APR_HOOK_MIDDLE);
+    ap_hook_translate_name(translate_userdir,aszPre,NULL,APR_HOOK_MIDDLE);
 #ifdef HAVE_UNIX_SUEXEC
     ap_hook_get_suexec_identity(get_suexec_id_doer,NULL,NULL,APR_HOOK_MIDDLE);
 #endif