clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 06:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
a4d5a78f89
php-src/ext/fileinfo
History
Stanislav Malyshev b3709bfc52 Merge branch 'PHP-5.6' 
* PHP-5.6: (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:
	Zend/zend_exceptions.c
	ext/curl/interface.c
	ext/dom/document.c
	ext/fileinfo/libmagic/softmagic.c
	ext/gd/gd.c
	ext/hash/hash.c
	ext/pgsql/pgsql.c
	ext/phar/phar.c
	ext/phar/phar_internal.h
	ext/standard/http_fopen_wrapper.c
	ext/standard/link.c
	ext/standard/streamsfuncs.c
	ext/xmlwriter/php_xmlwriter.c
	ext/zlib/zlib.c
2015-04-14 01:28:06 -07:00
..
libmagic Merge branch 'PHP-5.6' 2015-04-14 01:28:06 -07:00
tests Merge branch 'PHP-5.6' 2015-04-14 01:28:06 -07:00
config.m4 Merge branch 'PHP-5.5' into PHP-5.6 2015-01-04 09:42:46 +01:00
config.w32 Forgot this one in the last commit, removes old VC support from ext/fileinfo 2015-03-29 07:54:18 +02:00
create_data_file.php This commit was manufactured by cvs2svn to create branch 'PHP_5_3'. 2008-07-25 02:44:58 +00:00
CREDITS - fix the build for win (vc6 or vc9) 2009-03-16 15:03:06 +00:00
data_file.c after merge fix 2015-03-08 19:56:31 +01:00
EXPERIMENTAL This commit was manufactured by cvs2svn to create branch 'PHP_5_3'. 2007-09-26 15:44:16 +00:00
fileinfo.c Merge branch 'PHP-5.6' 2015-04-14 01:28:06 -07:00
fileinfo.php typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-23 14:52:47 -08:00
libmagic.patch updated libmagic.patch 2015-03-29 18:22:42 +02:00
magicdata.patch Fixed bug #67647 Bundled libmagic 5.17 does not detect quicktime files correctly 2015-01-22 11:48:11 +01:00
Makefile.frag MFH: enable fileinfo by default 2008-07-25 09:16:22 +00:00
package.xml This commit was manufactured by cvs2svn to create branch 'PHP_5_3'. 2007-09-26 15:44:16 +00:00
php_fileinfo.h bump year 2015-01-15 23:27:30 +08:00