From: Stanislav Malyshev <stas@php.net>
Date: Tue, 29 Apr 2014 16:15:49 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~334^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c397fcc35f6b8b4ab0d1eba87e8bcc9992d1bee8;p=php

Merge branch 'PHP-5.5' into PHP-5.6

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

c397fcc35f6b8b4ab0d1eba87e8bcc9992d1bee8
diff --cc NEWS
index 768abece5d,513442bfba..227426b6a2
--- a/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)