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)

diff --cc NEWS
index 0ad3fa07499a6f3ce78aeafc24e641cc60aff578,ac6a6e9690bf467ebebff86ab6e596772c329949..e6aa66f0a27dc8cfc52af7d2e12bb81f9fea6ad1
--- 1/NEWS
--- 2/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)

diff --cc sapi/cgi/cgi_main.c
Simple merge