From: Stanislav Malyshev <stas@php.net>
Date: Fri, 29 Aug 2014 06:11:08 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.17RC1~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e55c641792df2caf813b5df3272144974e4d8fc7;p=php

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
---

e55c641792df2caf813b5df3272144974e4d8fc7
diff --cc NEWS
index ad114007e9,2451186867..459ecf8e1a
--- 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)