Anatoliy Belsky dffbc98239 Merge branch 'PHP-5.4' ... * PHP-5.4: (21 commits) Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt fix unchecked emalloc add CVE add bug 62146 add bug #62082 sync with HEAD sync with HEAD Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks) Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks) Fixed bug #61218 (FPM drops connection while receiving some binary values in FastCGI requests) Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests) Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured) - Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured) - Fixed bug #62160 (Add process.priority to set nice(2) priorities) - Fixed bug #62160 (Add process.priority to set nice(2) priorities) - add missing headers to avoid warnings - add missing headers to avoid warnings - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors) - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors) - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start) ... Conflicts: NEWS		2012-05-29 12:25:25 +02:00
..
aolserver	- Year++	2012-01-01 13:15:04 +00:00
apache	- Year++	2012-01-01 13:15:04 +00:00
apache2filter	Fixed bug #61172 (Add Apache 2.4 support)	2012-03-02 00:07:41 +00:00
apache2handler	Fixed bug #61172 (Add Apache 2.4 support)	2012-03-02 00:07:41 +00:00
apache_hooks	- Year++	2012-01-01 13:15:04 +00:00
caudium	- Year++	2012-01-01 13:15:04 +00:00
cgi	This test depends on the default_charset setting, so set it to	2012-05-23 17:48:01 -07:00
cli	Merge branch 'PHP-5.3' into PHP-5.4	2012-05-29 12:19:20 +02:00
continuity	Merge branch 'PHP-5.3' into PHP-5.4	2012-03-20 17:58:58 +01:00
embed	- Year++	2012-01-01 13:15:04 +00:00
fpm	Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)	2012-05-26 19:37:24 +02:00
isapi	- Year++	2012-01-01 13:15:04 +00:00
litespeed	fixed a crash in cli mode when apache_request_headers() is called	2011-12-31 18:15:22 +00:00
milter	- Year++	2012-01-01 13:15:04 +00:00
nsapi	Merge branch 'PHP-5.3' into PHP-5.4	2012-03-20 17:58:58 +01:00
phttpd	- Year++	2012-01-01 13:15:04 +00:00
pi3web	- Year++	2012-01-01 13:15:04 +00:00
roxen	- Year++	2012-01-01 13:15:04 +00:00
tests	- Rewrite scanner to be based on re2c instead of flex	2008-03-16 21:06:55 +00:00
thttpd	- Year++	2012-01-01 13:15:04 +00:00
tux	- Year++	2012-01-01 13:15:04 +00:00
webjames	- Year++	2012-01-01 13:15:04 +00:00