Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #67060: use default mode of 660

diff --cc NEWS
index 6def0cf17a9cf8fb7f8f53ca098beae6d2f72cbd,104279441a7faaaef5aebf0db781ecef3eb8b8fd..513442bfba87c02aab2536ccc89fddb83cc3a2ff
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -58,7 -54,9 +58,9 @@@ PH
      (Remi)
  
  - FPM:
 -  . Fixed bug #66482 (unknown entry 'priority' in php-fpm.conf). 
 -  . Fixed bug #67060 (sapi/fpm: possible privilege escalation due to insecure 
 +  . Fixed bug #66482 (unknown entry 'priority' in php-fpm.conf).
++  . Fixed bug #67060 (sapi/fpm: possible privilege escalation due to insecure
+     default configuration) (CVE-2014-0185). (Stas)
  
  - JSON:
    . Fixed bug #66021 (Blank line inside empty array/object when

diff --cc sapi/fpm/php-fpm.conf.in
Simple merge