scottmac Sat May 9 20:34:37 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/fileinfo/libmagic patchlevel.h readcdf.c
Log:
MFH Update bundled libmagic to 5.03
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/patchlevel.h?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/fileinfo/libmagic/patchlevel.h
diff -u php-src/ext/fileinfo/libmagic/patchlevel.h:1.1.2.3
php-src/ext/fileinfo/libmagic/patchlevel.h:1.1.2.4
--- php-src/ext/fileinfo/libmagic/patchlevel.h:1.1.2.3 Mon May 4 20:54:53 2009
+++ php-src/ext/fileinfo/libmagic/patchlevel.h Sat May 9 20:34:37 2009
@@ -1,11 +1,14 @@
#define FILE_VERSION_MAJOR 5
-#define patchlevel 2
+#define patchlevel 3
/*
* Patchlevel file for Ian Darwin's MAGIC command.
* $File: patchlevel.h,v 1.68 2008/03/22 21:39:43 christos Exp $
*
* $Log: patchlevel.h,v $
+ * Revision 1.1.2.4 2009/05/09 20:34:37 scottmac
+ * MFH Update bundled libmagic to 5.03
+ *
* Revision 1.1.2.3 2009/05/04 20:54:53 scottmac
* MFH Update libmagic to 5.02
*
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/readcdf.c?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: php-src/ext/fileinfo/libmagic/readcdf.c
diff -u php-src/ext/fileinfo/libmagic/readcdf.c:1.1.2.4
php-src/ext/fileinfo/libmagic/readcdf.c:1.1.2.5
--- php-src/ext/fileinfo/libmagic/readcdf.c:1.1.2.4 Mon May 4 20:54:53 2009
+++ php-src/ext/fileinfo/libmagic/readcdf.c Sat May 9 20:34:37 2009
@@ -157,15 +157,8 @@
size_t count;
int m;
- if (cdf_unpack_summary_info(sst, &si, &info, &count) == -1) {
- if (si.si_byte_order != 0xfffe)
- return 0;
- else
- return -1;
- }
-
- if (si.si_byte_order != 0xfffe)
- return 0;
+ if (cdf_unpack_summary_info(sst, &si, &info, &count) == -1)
+ return -1;
if (NOTMIME(ms)) {
if (file_printf(ms, "CDF V2 Document") == -1)
@@ -257,7 +250,7 @@
if ((i = cdf_read_summary_info(&info, &h, &sat, &ssat, &sst, &dir,
&scn)) == -1) {
- expn = "";
+ expn = "Cannot read summary info";
goto out4;
}
#ifdef CDF_DEBUG
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
