Xinchen Hui 91b2ddc816 Merge branch 'master' into phpng ... Conflicts: ext/spl/spl_array.c ext/spl/spl_directory.c ext/standard/formatted_print.c		2014-06-01 22:43:06 +08:00
..
apprentice.c	Merge branch 'PHP-5.5' into PHP-5.6	2014-03-31 16:57:39 +02:00
apptype.c	Fix bug #61504, potential vuln. in fileinfo. update to 5.11	2012-03-27 13:34:46 +02:00
ascmagic.c	updated to libmagic-5.17	2014-02-19 10:02:36 +01:00
cdf_time.c	upgraded libmagic to 5.14	2013-04-07 22:15:56 +02:00
cdf.c	Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)	2014-05-26 18:01:17 -07:00
cdf.h	upgraded libmagic to 5.14	2013-04-07 22:15:56 +02:00
compress.c	updated to libmagic-5.17	2014-02-19 10:02:36 +01:00
config.h	MFB:	2008-08-26 12:24:12 +00:00
elfclass.h	upgraded libmagic to 5.14	2013-04-07 22:15:56 +02:00
encoding.c	updated to libmagic-5.17	2014-02-19 10:02:36 +01:00
file.h	updated to libmagic-5.17	2014-02-19 10:02:36 +01:00
fsmagic.c	updated to libmagic-5.17	2014-02-19 10:02:36 +01:00
funcs.c	Refactor fileinfo	2014-05-07 13:50:29 +08:00
is_tar.c	Fix bug #61504, potential vuln. in fileinfo. update to 5.11	2012-03-27 13:34:46 +02:00
LICENSE	- add license	2009-06-26 07:25:38 +00:00
magic.c	updated to libmagic-5.17	2014-02-19 10:02:36 +01:00
magic.h	expose correct libmagic version	2014-02-19 10:48:52 +01:00
names.h
patchlevel.h	expose correct libmagic version	2014-02-19 10:48:52 +01:00
print.c	Merge branch 'PHP-5.4' into PHP-5.5	2013-04-27 13:51:12 +02:00
readcdf.c	backport this piece from 5.6, related to the #66307 fix	2014-04-24 19:50:23 +02:00
readelf.c	updated to libmagic-5.17	2014-02-19 10:02:36 +01:00
readelf.h	updated to libmagic-5.17	2014-02-19 10:02:36 +01:00
softmagic.c	Fixed ext/fileinfo conversion mistakes	2014-05-07 17:58:28 +04:00
strcasestr.c	added missing stdint header, bug #66907	2014-05-04 21:26:53 +02:00
tar.h	Fix bug #61504, potential vuln. in fileinfo. update to 5.11	2012-03-27 13:34:46 +02:00