Merge branch 'PHP-5.5' into PHP-5.6

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

diff --cc NEWS
index 768abece5db743d19b681b43b91e06bfb1d94464,513442bfba87c02aab2536ccc89fddb83cc3a2ff..227426b6a259016a740b6898743de3d823449e3e
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -43,12 -59,9 +43,14 @@@ PH
  
  - FPM:
    . Fixed bug #66482 (unknown entry 'priority' in php-fpm.conf).
 +  . Fixed bug #66908 (php-fpm reload leaks epoll_create() file descriptor).
 +    (Julio Pintos)
+   . Fixed bug #67060 (sapi/fpm: possible privilege escalation due to insecure
+     default configuration) (CVE-2014-0185). (Stas)
  
 +- GMP:
 +  . Fixed crashes in serialize/unserialize. (Stas)
 +
  - JSON:
    . Fixed bug #66021 (Blank line inside empty array/object when
      JSON_PRETTY_PRINT is set). (Kevin Israel)

diff --cc sapi/fpm/fpm/fpm_unix.c
Simple merge