[Pkg-php-commits] [php/debian-sid] Refreshed 056-mime_magic_liberal.patch

Ondřej Surý ondrej at sury.org
Fri Jan 8 13:50:24 UTC 2010


---
 debian/patches/056-mime_magic_liberal.patch |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/patches/056-mime_magic_liberal.patch b/debian/patches/056-mime_magic_liberal.patch
index d8dcce3..2906723 100644
--- a/debian/patches/056-mime_magic_liberal.patch
+++ b/debian/patches/056-mime_magic_liberal.patch
@@ -1,6 +1,6 @@
---- php.orig/ext/mime_magic/mime_magic.c
-+++ php/ext/mime_magic/mime_magic.c
-@@ -501,7 +501,7 @@ static int is_valid_mimetype(char *p, in
+--- a/ext/mime_magic/mime_magic.c
++++ b/ext/mime_magic/mime_magic.c
+@@ -503,7 +503,7 @@ static int is_valid_mimetype(char *p, in
  		} while (*(++p) != '/');
  		++p;
  		do {
@@ -9,7 +9,7 @@
  				return 0;
  			}
  		} while (*(++p));
-@@ -634,6 +634,15 @@ static int parse(char *l, int lineno)
+@@ -636,6 +636,15 @@ static int parse(char *l, int lineno)
      else if (strncmp(l, "string", NSTRING) == 0) {
  		m->type = STRING;
  		l += NSTRING;
@@ -25,7 +25,7 @@
      }
      else if (strncmp(l, "date", NDATE) == 0) {
  		m->type = DATE;
-@@ -727,7 +736,7 @@ static int parse(char *l, int lineno)
+@@ -729,7 +738,7 @@ static int parse(char *l, int lineno)
  	if (!is_valid_mimetype(l, strlen(l))) {
  		if(MIME_MAGIC_G(debug))
  			php_error_docref("http://www.php.net/mime_magic" TSRMLS_CC, E_WARNING, ": (%s:%d) '%s' is not a valid mimetype, entry skipped", MIME_MAGIC_G(magicfile), lineno, l);
-- 
1.6.3.3





More information about the Pkg-php-commits mailing list