com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS

Commit: e55c641792df2caf813b5df3272144974e4d8fc7 Author: Stanislav Malyshev <stas@php.net> Thu, 28 Aug 2014 23:11:08 -0700 Parents: b38ca3adeeee502d2fb1be9b8956c60a3d7c1f0e b206b0e29d2cf9a41b94befedfefd806a71d0846 Branches: PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e55c641792df2caf813b5df3272144974e4d8fc7 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: fix NEWS for fcgi fix merge restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606 Bugs: https://bugs.php.net/694 https://bugs.php.net/67606 Changed paths: MM NEWS Diff: diff --cc NEWS index ad11400,2451186..459ecf8 --- a/NEWS +++ b/NEWS @@@ -4,12 -4,7 +4,16 @@@ PH - Core: . Fixed bug #47358 (glob returns error, should be empty array()). (Pierre) + . Fixed bug #67878 (program_prefix not honoured in man pages). (Remi) + +- COM: + . Fixed bug #41577 (DOTNET is successful once per server run) + (Aidas Kasparas) + ++- FPM: ++ . Fixed #65641 (PHP-FPM incorrectly defines the SCRIPT_NAME variable when ++ using Apache). (David Zuelke) + - OpenSSL: . Fixed bug #41631 (socket timeouts not honored in blocking SSL reads). (Daniel Lowrey)