httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: httpd-2.0/modules/mappers mod_rewrite.c
Date Sun, 04 May 2003 18:31:19 GMT
nd          2003/05/04 11:31:19

  Modified:    .        CHANGES
               modules/mappers mod_rewrite.c
  Log:
  Make sure that mod_rewrite's type checker is evaluated before mod_mime.
  
  PR: 19626
  
  Revision  Changes    Path
  1.1158    +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1157
  retrieving revision 1.1158
  diff -u -r1.1157 -r1.1158
  --- CHANGES	2 May 2003 10:56:50 -0000	1.1157
  +++ CHANGES	4 May 2003 18:31:18 -0000	1.1158
  @@ -2,6 +2,10 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) Hook mod_rewrite's type checker before mod_mime's one. That way the
  +     RewriteRule [T=...] Flag should work as expected now. PR 19626.
  +     [André Malo]
  +
     *) Fix a problem with namespace mappings being dropped in mod_dav_fs; 
        if any property values were set which defined namespaces these 
        came out mangled in the PROPFIND response.  PR 11637.
  
  
  
  1.150     +6 -1      httpd-2.0/modules/mappers/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_rewrite.c,v
  retrieving revision 1.149
  retrieving revision 1.150
  diff -u -r1.149 -r1.150
  --- mod_rewrite.c	20 Mar 2003 21:50:39 -0000	1.149
  +++ mod_rewrite.c	4 May 2003 18:31:18 -0000	1.150
  @@ -4585,6 +4585,11 @@
        */
       static const char * const aszPre[]={ "mod_proxy.c", NULL };
   
  +    /* check type before mod_mime, so that [T=foo/bar] will not be
  +     * overridden by AddType definitions.
  +     */
  +    static const char * const ct_aszSucc[]={ "mod_mime.c", NULL };
  +
       APR_REGISTER_OPTIONAL_FN(ap_register_rewrite_mapfunc);
   
       ap_hook_handler(handler_redirect, NULL, NULL, APR_HOOK_MIDDLE);
  @@ -4594,7 +4599,7 @@
   
       ap_hook_fixups(hook_fixup, aszPre, NULL, APR_HOOK_FIRST);
       ap_hook_translate_name(hook_uri2file, NULL, NULL, APR_HOOK_FIRST);
  -    ap_hook_type_checker(hook_mimetype, NULL, NULL, APR_HOOK_MIDDLE);
  +    ap_hook_type_checker(hook_mimetype, NULL, ct_aszSucc, APR_HOOK_MIDDLE);
   }
   
       /* the main config structure */
  
  
  

Mime
View raw message