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