Dmitry Stogov 4c716e8b51 Merge branch 'master' into test ... * master: (39 commits) Add __debugInfo() to UPGRADING. fix TS build Update NEWS Update NEWS Update NEWS Small tidy ups and raise visibility of GitHub PR process Bug #41631: Observe socket read timeouts in SSL streams wrap int8_t and int16_t with #ifdef to avoid possible clashes - Updated to version 2014.6 (2014f) Removed Countable::count() change info from UPGRADE.INTERNALS too NEWS and UPGRADING for intdiv() Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option" Fixed skip case for intdiv 64-bit test Use callback structure Add EXPECTF Fix handling of multi-result sets with PS...used to clean not only the result set but the whole PS. 5.5.17 now 5.4.33-dev now Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option ... Conflicts: ext/fileinfo/libmagic/softmagic.c main/streams/xp_socket.c		2014-08-11 11:38:41 +04:00
..
libgd	Merge branch 'PHP-5.6'	2014-08-04 10:51:19 +02: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