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
..
libgd	Better fix for #68601 for perf	2015-04-05 17:36:47 -07:00
tests	Merge branch 'PHP-5.5' into PHP-5.6	2015-04-14 01:05:01 -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	add Marcus, enough work done	2003-06-15 20:16:46 +00:00
gd_compat.c	gd: fix previous (bad include)	2013-05-06 10:07:06 +02:00
gd_compat.h	Revert removal of overflow2 use in gd.c	2013-05-06 10:00:45 +02:00
gd_ctx.c	bump year	2015-01-15 23:26:37 +08:00
gd.c	Merge branch 'PHP-5.5' into PHP-5.6	2015-04-14 01:05:01 -07:00
gd.dsp	revert change #298288: Remove old dsp/dsw/makefile files	2010-04-28 14:41:51 +00:00
gdcache.c	Required GD >= 2.1.0 or GD bundled, this allows us to remove most of the #ifdef	2013-05-04 16:50:06 +02:00
gdcache.h	Last bit of CS fixes.	2003-12-28 21:08:46 +00:00
php_gd.h	bump year	2015-01-15 23:26:37 +08:00