summaryrefslogtreecommitdiff
path: root/ext/mime_magic
diff options
context:
space:
mode:
authorMoriyoshi Koizumi <moriyoshi@php.net>2003-03-31 19:48:53 +0000
committerMoriyoshi Koizumi <moriyoshi@php.net>2003-03-31 19:48:53 +0000
commit4932306f945f993305fb84bcb92b60d366d6f26a (patch)
tree00569f2925b8583d150f0745775d421349f07881 /ext/mime_magic
parent0235d331b76746c3803a14d89954931ae622b296 (diff)
downloadphp-git-4932306f945f993305fb84bcb92b60d366d6f26a.tar.gz
Rearranged search order for the magic file to avoid further confusions
Diffstat (limited to 'ext/mime_magic')
-rw-r--r--ext/mime_magic/config.m42
1 files changed, 1 insertions, 1 deletions
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