From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Mon, 31 Mar 2003 19:49:37 +0000 (+0000)
Subject: MFH(r-1.10): rearranged search order for the magic file to avoid further
X-Git-Tag: php-4.3.2RC2~226
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ec674deb74682e1a82f10f7b39891b6b512b46c;p=php

MFH(r-1.10): rearranged search order for the magic file to avoid further
confusions
---

diff --git a/ext/mime_magic/config.m4 b/ext/mime_magic/config.m4
index e65565724d..b47b1ba97b 100644
--- a/ext/mime_magic/config.m4
+++ b/ext/mime_magic/config.m4
@@ -22,7 +22,7 @@ if test "$PHP_MIME_MAGIC" != "no"; then
       AC_MSG_ERROR([File '$PHP_MIME_MAGIC' not found!])
     fi
   else
-    MAGIC_MIME_LOCATIONS="/usr/share/magic.mime /usr/share/misc/magic.mime /etc/magic.mime"
+    MAGIC_MIME_LOCATIONS="/usr/local/apache/conf/magic /usr/local/etc/apache/conf/magic /etc/apache/magic /etc/httpd/conf/magic /usr/share/magic.mime /usr/share/misc/magic.mime /etc/magic.mime"
 
     for i in $MAGIC_MIME_LOCATIONS; do
       if test -f $i; then