php-src/ext/gd
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
..
libgd Better fix for #68601 for perf 2015-04-05 17:36:47 -07:00
tests Merge branch 'PHP-5.6' 2015-04-14 01:28:06 -07:00
config.m4 Fix bug #68656 Report gd library version 2014-12-26 08:33:21 +01:00
config.w32 backport gd config.w32 to support freetype 2.5 2015-02-12 20:27:48 +01:00
CREDITS
gd_compat.c first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
gd_compat.h Revert removal of overflow2 use in gd.c 2013-05-06 10:00:45 +02:00
gd_ctx.c Cleanup resource handling APIs 2015-02-02 13:23:16 +08:00
gd.c Merge branch 'PHP-5.6' 2015-04-14 01:28:06 -07:00
gdcache.c trailing whitespace removal 2015-01-10 15:07:38 -08:00
gdcache.h
php_gd.h cleanup the mod version macros, round 2 2015-03-23 20:33:54 +01:00