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
..
tests	fix unstable test	2014-07-08 14:13:46 -07:00
config.m4	Fixed phpize build (default PHP_OPENSSL to no if not set)	2005-11-01 00:32:21 +00:00
config.w32	Add new (optional!) win32 build infrastructure.	2003-12-02 23:17:04 +00:00
CREDITS	- MFB	2002-12-26 23:45:05 +00:00
ftp.c	Merge branch 'master' into test	2014-08-11 11:38:41 +04:00
ftp.h	Fixed memory leaks	2014-05-06 15:18:17 +04:00
package.xml	Typo	2007-03-14 09:58:14 +00:00
php_ftp.c	Use reference counting instead of zval duplication	2014-06-05 16:04:11 +04:00
php_ftp.h	Bump year	2014-01-03 11:08:10 +08:00