17 Commits

Author	SHA1	Message	Date
Anatol Belski	bae44417a8	after merge fix	2015-03-08 19:56:31 +01:00
Anatol Belski	eeb74b0ab8	regenerated data file	2015-03-08 19:47:53 +01:00
Anatol Belski	1b77e51ad7	started to patch for libmagic.next ... everything is broken yet	2015-03-08 19:47:38 +01:00
Anatol Belski	969ce2e877	regenerated data file	2015-03-08 19:47:21 +01:00
Anatol Belski	2181ed2e2a	started to patch for libmagic.next ... everything is broken yet	2015-03-08 19:47:06 +01:00
Anatol Belski	c9d0894ec5	Fixed bug #67647 Bundled libmagic 5.17 does not detect quicktime files correctly	2015-01-22 11:48:11 +01:00
Anatol Belski	41a2f7074d	Fixed bug #68398 msooxml matches too many archives	2014-12-06 20:51:00 +01:00
Andrey Hristov	3dc9bef819	Merge branch 'PHP-5.5' into PHP-5.6 ... Conflicts: ext/fileinfo/data_file.c ext/fileinfo/libmagic/softmagic.c ext/fileinfo/magicdata.patch	2014-08-06 16:25:12 +03:00
Stanislav Malyshev	eeaec70758	Fix bug #67705 (extensive backtracking in rule regular expression)	2014-08-04 00:05:40 -07:00
Remi Collet	4374a52e9d	Fixed bug #66946 extensive backtracking in awk rule regular expression ... CVE-2013-7345 Applied upstream patch: ef2329cf71 Add the magicdata.patch to track patches applied to upstream data file.	2014-03-25 11:00:33 +01:00
Anatol Belski	967a6771d3	updated to libmagic-5.17	2014-02-19 10:02:36 +01:00
Anatol Belski	10367fa7c6	upgraded libmagic to 5.14	2013-04-07 22:15:56 +02:00
Pierre Joye	12cf930a40	Fix bug #61504, potential vuln. in fileinfo. update to 5.11	2012-03-27 13:34:46 +02:00
Scott MacVicar	c48241a569	MFH Update libmagic data file to 5.02	2009-05-04 20:56:13 +00:00
Scott MacVicar	7a29c8f386	MFH Update fileinfo to libmagic 5.00 and remove dependency on dirent.h on Windows	2009-03-15 23:04:19 +00:00
Scott MacVicar	3e543f2464	MFH: Sync libmagic with 4.26 and add support for the new v6 magic file format	2008-11-02 16:13:49 +00:00
SVN Migration	14ce4a1d0a	This commit was manufactured by cvs2svn to create branch 'PHP_5_3'.	2008-07-25 02:44:58 +00:00