com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS sapi/cgi/cgi_main.c
| From: | Stanislav Malyshev | Date: | Tue, 30 Dec 2014 09:26:53 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS sapi/cgi/cgi_main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83930@lists.php.net to get a copy of this message | ||
Commit: 4c0f17caca1fc0a9fab66ada9c43c960011308f0
Author: Stanislav Malyshev <stas@php.net> Tue, 30 Dec 2014 01:26:18 -0800
Parents: 24125f0f26f3787c006e4a51611ba33ee3b841cb 71c970077d9ad46fc595095c50f211b3136d6459
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4c0f17caca1fc0a9fab66ada9c43c960011308f0
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
FIx bug #68618 (out of bounds read crashes php-cgi)
Fixed bug #68676 (Explicit Double Free)
Bugs:
https://bugs.php.net/68618
https://bugs.php.net/68676
Changed paths:
MM NEWS
MM sapi/cgi/cgi_main.c
Diff:
diff --cc NEWS
index 0ad3fa0,ac6a6e9..e6aa66f
--- a/NEWS
+++ b/NEWS
@@@ -13,10 -14,13 +13,13 @@@
. Fixed bug #65769 (localeconv() broken in TS builds). (Anatol)
. Fixed bug #65230 (setting locale randomly broken). (Anatol)
. Fixed bug #68583 (Crash in timeout thread). (Anatol)
- . Fixed bug #68594 (Use after free vulnerability in unserialize()).
- (CVE-2014-8142) (Stefan Esser)
+ . Fixed bug #65576 (Constructor from trait conflicts with inherited
+ constructor). (dunglas at gmail dot com)
. Fixed bug #68676 (Explicit Double Free). (Kalle)
+ - CGI:
+ . Fix bug #68618 (out of bounds read crashes php-cgi). (Stas)
+
- cURL:
. Fixed bug #67643 (curl_multi_getcontent returns '' when
CURLOPT_RETURNTRANSFER isn't set). (Jille Timmermans)