Dmitry Stogov 7fcd4064c0 Merge branch 'master' into phpng ... * master: (41 commits) fix test - output can be chunked fix test fix test Fixed test for commit 997be125eb Add bug fix to NEWS Update UPGRADING according to bug fix fix test improve CURL tests to allow testing without separate server improve CURL tests to allow testing without separate server Fixed bug #67199 mb_regex_encoding mishmash Fix bug #67248 (imageaffinematrixget missing check of parameters) Fix bug #67247 spl_fixedarray_resize integer overflow fix news add tests stuff to README Updated NEWS Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions... - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org) - Move checking - Fixed missing NULL check in SimpleXMLElement::xpath() - Fixed missing NULL check ... Conflicts: ext/bz2/bz2.c ext/gd/gd.c ext/mbstring/php_mbregex.c ext/session/tests/031.phpt ext/simplexml/simplexml.c ext/spl/spl_fixedarray.c		2014-05-13 15:24:40 +04:00
..
libgd	Merge branch 'PHP-5.6'	2014-03-12 19:31:21 +01:00
tests	Merge branch 'PHP-5.5' into PHP-5.6	2014-05-11 18:56:32 -07:00
config.m4	Merge branch 'PHP-5.4' into PHP-5.5	2013-12-07 19:41:23 -08:00
config.w32	fix include search	2014-03-12 19:25:20 +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	Refactor ext/gd (all tests passes)	2014-05-12 15:53:35 +08:00
gd.c	Merge branch 'master' into phpng	2014-05-13 15:24:40 +04: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	2014-01-03 11:08:10 +08:00