com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS sapi/fpm/php-fpm.conf.in
| From: | Stanislav Malyshev | Date: | Tue, 29 Apr 2014 16:15:23 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS sapi/fpm/php-fpm.conf.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77171@lists.php.net to get a copy of this message | ||
Commit: 770fcdab90d053803d91dbc4d5cbf3846c201ed9
Author: Stanislav Malyshev <stas@php.net> Tue, 29 Apr 2014 09:14:40 -0700
Parents: 3fbacdc6e87383b0e0765850398aaae6547c5216 35ceea928b12373a3b1e3eecdc32ed323223a40d
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=770fcdab90d053803d91dbc4d5cbf3846c201ed9
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #67060: use default mode of 660
Bugs:
https://bugs.php.net/67060
Changed paths:
MM NEWS
MM sapi/fpm/php-fpm.conf.in
Diff:
diff --cc NEWS
index 6def0cf,1042794..513442b
--- a/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