Commit c0d4db50 authored by Joshua Slive's avatar Joshua Slive
Browse files 

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
parent 20aac2e1

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line 
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]










































modules/mappers/mod_alias.c



+2
−2



























Changes for modules/mappers/mod_alias.c: 2 added lines, 2 removed lines.



Original line number
Diff line number
Diff line







@@ -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);









}












































modules/mappers/mod_userdir.c



+2
−2



























Changes for modules/mappers/mod_userdir.c: 2 added lines, 2 removed lines.



Original line number
Diff line number
Diff line







@@ -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