Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  FIx bug #68618 (out of bounds read crashes php-cgi)

diff --cc NEWS
index 8bcb236ef9d3c248faef720986730d75e426e5db,fa57ef3161c3d77d060bbb8ec5414c80bc618045..ac6a6e9690bf467ebebff86ab6e596772c329949
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,92 -1,16 +1,95 @@@
 -PHP                                                                        NEWS
 +PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 20?? PHP 5.4.37
 +?? ??? 2014, PHP 5.5.21
 +
 +- Core:
 +  . Upgraded crypt_blowfish to version 1.3. (Leigh)
 +  . Fixed bug #60704 (unlink() bug with some files path). 
 +  . Fixed bug #65419 (Inside trait, self::class != __CLASS__). (Julien)
 +  . Fixed bug #65576 (Constructor from trait conflicts with inherited
 +    constructor). (dunglas at gmail dot com)
 +  . Fixed bug #55541 (errors spawn MessageBox, which blocks test automation).
 +    (Anatol)
 +  . Fixed bug #68297 (Application Popup provides too few information). (Anatol)
 +  . 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 #68676 (Explicit Double Free). (Kalle)
 +
+ - CGI:
+   . Fix bug #68618 (out of bounds read crashes php-cgi). (Stas)
+ 
 -18 Dec 2014 PHP 5.4.36
 +- cURL:
 +  . Fixed bug #67643 (curl_multi_getcontent returns '' when
 +    CURLOPT_RETURNTRANSFER isn't set). (Jille Timmermans)
 +
 +- GD:
 +  . Fixed bug #68601 (buffer read overflow in gd_gif_in.c). (Jan Bee, Remi)
 +
 +- Mbstring:
 +  . Fixed bug #68504 (--with-libmbfl configure option not present on Windows).
 +    (Ashesh Vashi)
 +
 +- Mcrypt:
 +  . Fixed possible read after end of buffer and use after free. (Dmitry)
 +
 +- Opcache:
 +  . Fixed bug #67111 (Memory leak when using "continue 2" inside two foreach
 +    loops). (Nikita)
 +
 +- Pcntl:
 +  . Fixed bug #60509 (pcntl_signal doesn't decrease ref-count of old handler
 +    when setting SIG_DFL). (Julien)
 +
 +- PDO_mysql
 +  . Fixed bug #68424 (Add new PDO mysql connection attr to control multi
 +    statements option). (peter dot wolanin at acquia dot com)
 +
 +- SPL:
 +  . Fixed bug #66405 (RecursiveDirectoryIterator::CURRENT_AS_PATHNAME
 +    breaks the RecursiveIterator). (Paul Garvin)
 +  . Fixed bug #65213 (cannot cast SplFileInfo to boolean) (Tjerk)
 +  . Fixed bug #68479 (Added escape parameter to SplFileObject::fputcsv). (Salathe)
 +
 +- SQLite:
 +  . Fixed bug #68120 (Update bundled libsqlite to 3.8.7.2). (Anatol)
 +
 +- Streams:
 +  . Fixed bug #68532 (convert.base64-encode omits padding bytes).
 +    (blaesius at krumedia dot de)
 +
 +18 Dec 2014, PHP 5.5.20
  
  - Core:
 -  . Upgraded crypt_blowfish to version 1.3. (Leigh)
 +  . Fixed bug #68091 (Some Zend headers lack appropriate extern "C" blocks).
 +    (Adam)
 +  . Fixed bug #68185 ("Inconsistent insteadof definition."- incorrectly 
 +    triggered). (Julien)
 +  . Fixed bug #68370 ("unset($this)" can make the program crash). (Laruence)
    . Fixed bug #68545 (NULL pointer dereference in unserialize.c). (Anatol)
 -  . Fixed bug #68594 (Use after free vulnerability in unserialize()).
 -    (CVE-2014-8142) (Stefan Esser)
 +
 +- Date:
 +  . Fixed day_of_week function as it could sometimes return negative values
 +    internally. (Derick)
 +
 +- FPM:
 +  . Fixed bug #68381 (fpm_unix_init_main ignores log_level).
 +    (David Zuelke, Remi)
 +  . Fixed bug #68420 (listen=9000 listens to ipv6 localhost instead of all
 +    addresses). (Remi)
 +  . Fixed bug #68421 (access.format='%R' doesn't log ipv6 address). (Remi)
 +  . Fixed bug #68423 (PHP-FPM will no longer load all pools). (Remi)
 +  . Fixed bug #68428 (listen.allowed_clients is IPv4 only). (Remi)
 +  . Fixed bug #68452 (php-fpm man page is oudated). (Remi)
 +  . Fixed request #68458 (Change pm.start_servers default warning to
 +    notice). (David Zuelke, Remi)
 +  . Fixed bug #68463 (listen.allowed_clients can silently result
 +    in no allowed access). (Remi)
 +  . Fixed request #68391 (php-fpm conf files loading order).
 +    (Florian Margaine, Remi)
 +  . Fixed bug #68478 (access.log don't use prefix). (Remi)
  
  - Mcrypt:
    . Fixed possible read after end of buffer and use after free. (Dmitry)

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