php4-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-4.4.9/ext/mime_magic/mime_magic.c~      2007-12-31 08:22:49.000000000 +0100
  13 +++ php-4.4.9/ext/mime_magic/mime_magic.c       2013-02-20 09:07:01.388809868 +0100
  14 @@ -478,8 +478,8 @@
  15      /* get offset, then skip over it */
  16      m->offset = (int) strtol(l, &t, 0);
  17      if (l == t) {
  18 -               php_error(E_WARNING,
  19 -                                        MODNAME ": (line %d) offset `%s' invalid", lineno, l);
  20 +               //php_error(E_WARNING,
  21 +               //                       MODNAME ": (line %d) offset `%s' invalid", lineno, l);
  22      }
  23      l = t;
  24
  25 @@ -501,8 +501,8 @@
  26                                 m->in.type = BYTE;
  27                                 break;
  28                         default:
  29 -                               php_error(E_WARNING,
  30 -                                                        MODNAME ": indirect offset type %c invalid", *l);
  31 +                               //php_error(E_WARNING,
  32 +                               //                       MODNAME ": indirect offset type %c invalid", *l);
  33                                 break;
  34                         }
  35                         l++;
  36 @@ -518,8 +518,8 @@
  37                 else
  38                         t = l;
  39                 if (*t++ != ')') {
  40 -                       php_error(E_WARNING,
  41 -                                                MODNAME ": missing ')' in indirect offset");
  42 +                       //php_error(E_WARNING,
  43 +                       //                       MODNAME ": missing ')' in indirect offset");
  44                 }
  45                 l = t;
  46      }
  47 @@ -592,8 +592,8 @@
  48                 l += NLEDATE;
  49      }
  50      else {
  51 -               php_error(E_WARNING,
  52 -                                        MODNAME ": type %s invalid", l);
  53 +               //php_error(E_WARNING,
  54 +               //                       MODNAME ": type %s invalid", l);
  55                 return -1;
  56      }
  57      /* New-style anding: "0 byte&0x80 =0x80 dynamically linked" */