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 Tue, 13 May 2003 22:49:40 GMT
nd          2003/05/13 15:49:40

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/mappers Tag: APACHE_2_0_BRANCH mod_rewrite.c
  Log:
  Make sure that mod_rewrite's type checker is evaluated before mod_mime.
  
  PR: 19626
  Reviewed by: Jeff Trawick, Bill Stoddard
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.988.2.93 +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.92
  retrieving revision 1.988.2.93
  diff -u -r1.988.2.92 -r1.988.2.93
  --- CHANGES	13 May 2003 17:18:38 -0000	1.988.2.92
  +++ CHANGES	13 May 2003 22:49:37 -0000	1.988.2.93
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.46
   
  +  *) 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]
  +
     *) htpasswd: Check the processed file on validity. If a line is not empty
        and not a comment, it must contain at least one colon. Otherwise exit
        with error code 7. [Kris Verbeeck <Kris.Verbeeck@ubizen.com>, Thom May]
  
  
  
  1.751.2.265 +1 -6      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.264
  retrieving revision 1.751.2.265
  diff -u -r1.751.2.264 -r1.751.2.265
  --- STATUS	13 May 2003 22:17:44 -0000	1.751.2.264
  +++ STATUS	13 May 2003 22:49:38 -0000	1.751.2.265
  @@ -196,11 +196,6 @@
         (the docs should explain the thing better. Currently it's not
          really understandable for users. If nobody else does, nd tries to.)
   
  -    * Hook mod_rewrite's type checker before mod_mime's one. That way the
  -      RewriteRule [T=...] Flag should work as expected now. PR 19626.
  -      modules/mappers/mod_rewrite.c r1.150
  -      +1: nd, trawick, stoddard
  -
       * mod_auth_ldap: Use generic whitespace character class when parsing
         "require" directives, instead of literal spaces only. PR 17135.
         modules/experimental/mod_auth_ldap.c r1.16
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.135.2.11 +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.135.2.10
  retrieving revision 1.135.2.11
  diff -u -r1.135.2.10 -r1.135.2.11
  --- mod_rewrite.c	27 Mar 2003 22:52:22 -0000	1.135.2.10
  +++ mod_rewrite.c	13 May 2003 22:49:39 -0000	1.135.2.11
  @@ -4484,6 +4484,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);
  @@ -4493,7 +4498,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