Make sure mod_mime always has a chance to run before mod_mime_magic.

Submitted by:	Paul Reder <rederpj@raleigh.ibm.com>
Reviewed by:	Bill Stoddard <stoddard@raleigh.ibm.com>

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

diff --git a/modules/metadata/mod_mime_magic.c b/modules/metadata/mod_mime_magic.c
index 218ee926847d82f67a396bd7a564f314acf216d8..a285413a2d76d375c66326a47b99db7e34ce3197 100644 (file)
--- a/modules/metadata/mod_mime_magic.c
+++ b/modules/metadata/mod_mime_magic.c
@@ -2482,7 +2482,11 @@ static int magic_find_ct(request_rec *r)
 
 static void register_hooks(void)
 {
-    ap_hook_type_checker(magic_find_ct, NULL, NULL, HOOK_MIDDLE);
+    static const char * const aszPre[]={ "mod_mime.c", NULL };
+
+    /* mod_mime_magic should be run after mod_mime, if at all. */
+
+    ap_hook_type_checker(magic_find_ct, aszPre, NULL, HOOK_MIDDLE);
     ap_hook_post_config(magic_init, NULL, NULL, HOOK_FIRST);
 }