Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  format
  add CVE

diff --cc NEWS
index 1709e1ac67009c40275290c51cbc1346a2994ffe,b0177e1da0f59ebe283f1e584861331cc6cf6e94..a0ff66696543d9fd2a7f515e2f64ff3c193beac9
--- 1/NEWS
--- 2/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)
  
 -  . Fixed bug #68799: Free called on unitialized pointer. (CVE-2015-0232) (Stas)
 +- 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)
+ 
  - 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