httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sl...@apache.org
Subject cvs commit: httpd-2.0/modules/mappers mod_alias.c mod_userdir.c
Date Tue, 07 May 2002 00:17:11 GMT
slive       02/05/06 17:17:11

  Modified:    .        CHANGES
               modules/mappers mod_alias.c mod_userdir.c
  Log:
  Reverse the hook ordering for mod_userdir and mod_alias so
  that Alias/ScriptAlias will override Userdir.
  
  PR: 8841
  Reviewed by:	Justin Erenkrantz
  
  Revision  Changes    Path
  1.764     +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.763
  retrieving revision 1.764
  diff -u -d -b -u -r1.763 -r1.764
  --- CHANGES	6 May 2002 22:23:51 -0000	1.763
  +++ CHANGES	7 May 2002 00:17:10 -0000	1.764
  @@ -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]
   
  
  
  
  1.39      +2 -2      httpd-2.0/modules/mappers/mod_alias.c
  
  Index: mod_alias.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_alias.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -d -b -u -r1.38 -r1.39
  --- mod_alias.c	16 Mar 2002 18:26:57 -0000	1.38
  +++ mod_alias.c	7 May 2002 00:17:11 -0000	1.39
  @@ -467,9 +467,9 @@
   
   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);
   }
   
  
  
  
  1.47      +2 -2      httpd-2.0/modules/mappers/mod_userdir.c
  
  Index: mod_userdir.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_userdir.c,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -d -b -u -r1.46 -r1.47
  --- mod_userdir.c	29 Apr 2002 07:45:43 -0000	1.46
  +++ mod_userdir.c	7 May 2002 00:17:11 -0000	1.47
  @@ -392,9 +392,9 @@
   
   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
  
  
  

Mime
View raw message