Make sure that mod_rewrite's type checker is evaluated before mod_mime.

PR: 19626
Reviewed by: Jeff Trawick, Bill Stoddard

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

diff --git a/CHANGES b/CHANGES
index 8236e80b507ef1e139611d110239eadf52aa1356..a95ee026b9628a077a8f01a9fa6ea2ef2d71da38 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]

diff --git a/STATUS b/STATUS
index 522c1ded5af535498ac62174c72906311ac005c5..5db7d0e1459995082126a27cb01589d94dc3807f 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/05/13 22:17:44 $]
+Last modified at [$Date: 2003/05/13 22:49:38 $]
 
 Release:
 
@@ -196,11 +196,6 @@ PATCHES TO PORT FROM 2.1
       (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

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 5d13517a236f2f5b3037868165b6219c93884802..65e4c92d5e1b83ae22e15cfc27348f336b39c129 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -4484,6 +4484,11 @@ static void register_hooks(apr_pool_t *p)
      */
     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 @@ static void register_hooks(apr_pool_t *p)
 
     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 */