Dmitry Stogov b108267f2c Merge branch 'master' into phpng ... * master: (41 commits) Update copyright year to 2014 Update copyright year to 2014 Update copyright year to 2014 Update copyright year to 2014 Update copyright year to 2014 Update copyright year to 2014 Update copyright year to 2014 NEWS Fix Request #67453 Allow to unserialize empty data. Update copyright year to 2014 Update copyright year for re2c generated files Update copyright year to 2014 Update copyright year for re2c files as well Fix patch for bug #67436 fix failed test Fix test on modern distro where old unsecure algo are disabled in openssl config. Testing recent algo should be enough to check this function. Added tests for bug 67436 Fixed wrong XFAIL test - already fixed Fix typo in Bug #67406 NEWS entry Fix typo in Bug #67406 NEWS entry ... Conflicts: Zend/zend_compile.c ext/session/session.c ext/standard/array.c ext/standard/http_fopen_wrapper.c tests/classes/bug63462.phpt		2014-06-18 17:50: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	Fixed apply_func_t (they should be broken before)	2014-05-25 18:32:35 +08:00
cli	Merge branch 'master' into phpng	2014-06-18 17:50:27 +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	There should been memory leaks(and don't use pointer cast)	2014-05-08 15:20:13 +08:00
isapi	Bump year	2014-01-03 11:08:10 +08:00
litespeed	Merge mainstream 'master' branch into refactoring	2014-04-26 00:32:51 +04:00
milter	Cleanup (1-st round)	2014-04-15 15:40:40 +04:00
nsapi	Cleanup (1-st round)	2014-04-15 15:40:40 +04:00
phpdbg	Update copyright year to 2014	2014-06-16 23:34:50 +03: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