Re: com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS
| From: | Ferenc Kovacs | Date: | Wed, 21 Jan 2015 00:02:25 +0000 |
| Subject: | Re: com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-84237@lists.php.net to get a copy of this message | ||
On Tue, Jan 20, 2015 at 8:59 PM, Stanislav Malyshev <stas@php.net> wrote:
> Commit: b2a254fe2d02ca4c3706223c962c55df2dc3adec
> Author: Stanislav Malyshev <stas@php.net> Tue, 20 Jan 2015
> 11:58:04 -0800
> Parents: c9162147f23426dbe0a35c755cadd172aab5dae1
> 53b3db43caa658a1dff12e79182d80b0d2db85e6
> Branches: PHP-5.6
>
> Link:
>
> http://git.php.net/?p=php-src.git;a=commitdiff;h=b2a254fe2d02ca4c3706223c962c55df2dc3adec
>
> Log:
> Merge branch 'PHP-5.5' into PHP-5.6
>
> * PHP-5.5:
> update NEWS
> format
> add CVE
>
> Changed paths:
> MM NEWS
>
>
> Diff:
> diff --cc NEWS
> index 1709e1a,b0177e1..a0ff666
> --- a/NEWS
> +++ b/NEWS
> @@@ -32,27 -32,27 +32,32 @@@
> . Fixed bug #66764 (configure doesn't define EXPANDED_DATADIR /
> PHP_DATADIR
> correctly). (Ferenc)
> . 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)
> + . Fixed bug #68710 (Use After Free Vulnerability in PHP's
> unserialize()).
> + (CVE-2015-0231) (Stefan Esser)
>
> - CGI:
> - . Fix bug #68618 (out of bounds read crashes php-cgi). (Stas)
> -
> - - CLI server:
> - . Fix bug #68745 (Invalid HTTP requests make web server segfault).
> (Adam)
> + . Fixed bug #68618 (out of bounds read crashes php-cgi).
> (CVE-2014-9427)
> + (Stas)
> -
> -- CLI server:
> + . Fixed bug #68745 (Invalid HTTP requests make web server segfault).
> (Adam)
>
> - cURL:
> . Fixed bug #67643 (curl_multi_getcontent returns '' when
> CURLOPT_RETURNTRANSFER isn't set). (Jille Timmermans)
>
> +- Date:
> + . Implemented FR #68268 (DatePeriod: Getter for start date, end date
> and
> + interval). (Marc Bennewitz)
> +
> + - EXIF:
> - . Fixed bug #68799: Free called on unitialized pointer.
> (CVE-2015-0232) (Stas)
> ++ . Fixed bug #68799: Free called on unitialized pointer. (CVE-2015-0232)
> ++ (Stas)
> +
> - Fileinfo:
> + . Fixed bug #68398 (msooxml matches too many archives). (Anatol)
> + . Fixed bug #68665 (invalid free in libmagic). (Joshua Rogers, Anatol
> Belski)
> . Fixed bug #68671 (incorrect expression in libmagic).
> (Joshua Rogers, Anatol Belski)
> . Removed readelf.c and related code from libmagic sources
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>
did you intentionally merge the entry from CLI server to CGI or just a
mistake when merging the NEWS changes?
--
Ferenc Kovács
@Tyr43l - http://tyrael.hu