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

diff --cc NEWS
index ad114007e9b1cd18f5925b77a9387df7eda216a4,24511868676cc95917583b00d3ed95de949a72d9..459ecf8e1a682d608feaf1ac79e9247c1a07cc08
--- 1/NEWS
--- 2/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)