Dmitry Stogov 7497c8793d Merge branch 'master' into phpng ... * master: (51 commits) Update Git rules Back to -dev (with EOL notice in NEWS) new NEWS block for the next release It's 2014 already, fix copyright year where user visible PHP 5.3.29 Some changes were lost in the merge commit of #66091 Updated NEWS for #66091 Fixed #66091 Updated NEWS for #66091 Updated NEWS for #66091 Fixed #66091 updated NEWS updated NEWS updated NEWS backported the fix for bug #41577 NEWS entry for e6d93a1 / d73d44c restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606 Revert "Merge branch 'pull-request/694' into PHP-5.6" PHP 5.3.29RC1 Fix missing type checks in various functions ... Conflicts: ext/date/php_date.c ext/standard/math.c		2014-08-14 23:30:49 +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	cleanup (we don't have to duplicate elements of module_registry)	2014-08-13 17:05:18 +04:00
cli	cleanup	2014-08-13 19:43:34 +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 'master' into phpng	2014-08-14 23:30:49 +04: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