Commit 375e3b19 authored by Joe Orton's avatar Joe Orton
Browse files

Backport from HEAD: 

* modules/mappers/mod_userdir.c (register_hooks): Move suexec_identity
hook to APR_HOOK_FIRST to ensure it runs before the mod_suexec hook.

PR: 18156
Submitted by: Joshua Slive
Reviewed by: jorton, slive, nd


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104767 13f79535-47bb-0310-9956-ffa450edef68
parent 1302b2ab

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.51









  *) mod_userdir: Ensure that the userdir identity is used for









     suexec userdir access in a virtual host which has suexec configured.  









     PR 18156.  [Joshua Slive]

















  *) mod_rewrite no longer confuses the RewriteMap caches if









     different maps defined in different virtual hosts use the









     same map name. PR 26462.  [André Malo]


































modules/mappers/mod_userdir.c



+1
−1



























Changes for modules/mappers/mod_userdir.c: 1 added line, 1 removed line.



Original line number
Diff line number
Diff line







@@ -350,7 +350,7 @@ static void register_hooks(apr_pool_t *p)

















    ap_hook_translate_name(translate_userdir,aszPre,aszSucc,APR_HOOK_MIDDLE);









#ifdef HAVE_UNIX_SUEXEC









    ap_hook_get_suexec_identity(get_suexec_id_doer,NULL,NULL,APR_HOOK_MIDDLE);









    ap_hook_get_suexec_identity(get_suexec_id_doer,NULL,NULL,APR_HOOK_FIRST);









#endif









}