Stanislav Malyshev 5776fceb16 Merge branch 'PHP-5.5' into PHP-5.6 ... * PHP-5.5: (27 commits) fix non-standard C update NEWS 5.4.41 next fix CVE num update NEWS Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode) fix test fix type in fix for #69085 fix memory leak & add test Fix tests fix CVE num Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability) Fix test Additional fix for bug #69324 More fixes for bug #69152 Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar) Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) ... Conflicts: ext/standard/http_fopen_wrapper.c		2015-04-14 01:05:01 -07:00
..
apprentice.c	Merge branch 'PHP-5.5' into PHP-5.6	2015-01-22 10:17:14 +01: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	Merge branch 'PHP-5.5' into PHP-5.6	2014-08-14 17:22:06 -07:00
cdf.h	Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files	2014-06-03 11:37:20 +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	Merge branch 'PHP-5.5' into PHP-5.6	2015-01-04 09:42:46 +01:00
fsmagic.c	updated to libmagic-5.17	2014-02-19 10:02:36 +01:00
funcs.c	Fixed bug #67731 finfo::file() returns invalid mime type for binary files	2014-08-30 04:04:42 +02: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	typo fixes - https://github.com/vlajos/misspell_fixer	2014-11-23 14:33:43 -08:00
print.c	Fixed bug #68671 incorrect expression in libmagic	2014-12-30 19:37:27 +01:00
readcdf.c	Fix bug #68224 buffer-overflow in /ext/fileinfo/libmagic/readcdf.c caught by AddressSanitizer	2014-10-22 15:24:59 +02:00
softmagic.c	Merge branch 'PHP-5.5' into PHP-5.6	2015-04-14 01:05:01 -07: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