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
..
aolserver	Cleanup (1-st round)	2014-04-15 15:40:40 +04:00
apache	Added support for apache and apache2handler SAPIs (They seem slower than FastCGI)	2014-05-06 13:26:23 +04:00
apache2filter	fix hash API calls	2014-05-17 08:12:18 +02:00
apache2handler	Added support for apache and apache2handler SAPIs (They seem slower than FastCGI)	2014-05-06 13:26:23 +04:00
apache_hooks	Cleanup (1-st round)	2014-04-15 15:40:40 +04:00
caudium	Merge branch 'PHP-5.6'	2014-01-03 11:09:07 +08:00
cgi	Merge remote-tracking branch 'origin/master' into phpng	2014-07-18 16:25:43 +08:00
cli	Merge branch 'master' into phpng	2014-07-14 11:44:53 +04:00
continuity	Update copyright year to 2014	2014-06-18 00:22:16 +03:00
embed	Merge branch 'PHP-5.6'	2014-03-24 10:32:07 +01:00
fpm	Merge branch 'PHP-5.5' into PHP-5.6	2014-07-25 10:52:41 +08:00
isapi	Bump year	2014-01-03 11:08:10 +08:00
litespeed	Merge branch 'master' into phpng	2014-07-14 11:44:53 +04:00
milter	Merge branch 'master' into phpng	2014-08-04 13:56:27 +04:00
nsapi	Cleanup (1-st round)	2014-04-15 15:40:40 +04:00
phpdbg	Merge sapi/phpdbg into PHP-5.6	2014-07-06 01:17:50 +02:00
phttpd	Bump year	2014-01-03 11:08:10 +08:00
pi3web	Merge branch 'PHP-5.6'	2014-01-03 11:09:07 +08:00
roxen	Merge branch 'PHP-5.6'	2014-01-03 11:09:07 +08:00
tests	- Rewrite scanner to be based on re2c instead of flex	2008-03-16 21:06:55 +00:00
thttpd	Merge branch 'PHP-5.6'	2014-01-03 11:09:07 +08:00
tux	Merge branch 'PHP-5.6'	2014-01-03 11:09:07 +08:00
webjames	Bump year	2014-01-03 11:08:10 +08:00