]> git.pld-linux.org Git - packages/php.git/blob - php-mime_magic.patch
- rel 2; ignore errors when parsing magic file (magic file contains new, unsupported...
[packages/php.git] / php-mime_magic.patch
1 --- php-5.2.6/ext/mime_magic/config.m4  2007-07-03 19:25:34.000000000 +0200
2 +++ php-5.2.6.new/ext/mime_magic/config.m4      2008-06-16 09:32:48.996084697 +0200
3 @@ -18,8 +18,6 @@
4    if test "$PHP_MIME_MAGIC" != "yes"; then
5      if test -f $PHP_MIME_MAGIC; then
6        PHP_MIME_MAGIC_FILE_PATH=$PHP_MIME_MAGIC
7 -    else
8 -      AC_MSG_ERROR([File '$PHP_MIME_MAGIC' not found!])
9      fi
10    else
11      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"
12 --- php-5.2.17/ext/mime_magic/mime_magic.c~     2010-01-03 10:23:27.000000000 +0100
13 +++ php-5.2.17/ext/mime_magic/mime_magic.c      2011-01-19 16:58:40.032694842 +0100
14 @@ -441,8 +441,9 @@
15                         continue;
16  
17                 /* parse it */
18 -               if (parse(line + ws_offset, lineno) != 0)
19 -                       ++errs;
20 +               if (parse(line + ws_offset, lineno) != 0) {
21 +                       //++errs;
22 +               }
23      }
24  
25      (void) fclose(f);
This page took 0.028317 seconds and 4 git commands to generate.