From: Joshua Slive <slive@apache.org>
Date: Tue, 7 May 2002 00:17:11 +0000 (+0000)
Subject: Reverse the hook ordering for mod_userdir and mod_alias so
X-Git-Tag: 2.0.37~469
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0cf8e3be483524bef21677953603434e6d8b6973;p=apache

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 3bcd6dc1da..ff0f09a72f 100644
--- 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 11e974ec07..e21f836e64 100644
--- 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 0b035894a1..19408ee0c8 100644
--- 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