Dmitry Stogov 7301994c28 Merge branch 'master' into phpng ... * master: (46 commits) PHP_INT_MIN and _MAX tests NEWS and UPGRADING Added PHP_INT_MIN Fix wrong lenght size Bug #51096 - Remove unnecessary ? for first/last day of Moved streams related functions to xp_ssl.c Remove duplicate NEWS Update NEWS Update NEWS Update NEWS BFN BFN Fixed bug #67715 (php-milter does not build and crashes randomly). We need to turn off any strict mode here for this warning to show up Disable restrictions regarding arrays in constants at run-time. For the discussion around it, see the thread on the mailing list: http://www.mail-archive.com/internals@lists.php.net/msg68245.html Revert "Fix bug #67064 in a BC safe way" Updated NEWS for #67693 Updated NEWS for #67693 Fixed bug #67693 - incorrect push to the empty array add missing entry to NEWS ... Conflicts: Zend/tests/errmsg_040.phpt Zend/tests/ns_059.phpt Zend/zend_language_parser.y Zend/zend_vm_def.h ext/openssl/openssl.c ext/reflection/php_reflection.c ext/session/session.c ext/spl/spl_directory.c ext/spl/spl_iterators.c ext/sqlite3/sqlite3.c ext/standard/array.c		2014-08-04 13:56:27 +04:00
..
tests	Corrected patch for bug #60616	2014-07-30 02:28:31 +00:00
birdstep.c	Bump year	2014-01-03 11:08:10 +08:00
config.m4	Merge branch 'PHP-5.4' into PHP-5.5	2013-08-18 14:16:24 -07:00
config.w32	- do not enable an ext when a lib/header fails	2008-06-23 18:40:29 +00:00
CREDITS
php_birdstep.h	Bump year	2014-01-03 11:08:10 +08:00
php_odbc_includes.h	Corrected patch for bug #60616	2014-07-30 02:28:31 +00:00
php_odbc.c	Merge branch 'master' into phpng	2014-08-04 13:56:27 +04:00
php_odbc.h	Bump year	2014-01-03 11:08:10 +08:00