From: Stanislav Malyshev <stas@php.net>
Date: Sun, 1 Feb 2015 08:35:41 +0000 (-0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.6RC1~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac3a4e420036d125bc2f3e8ecba42de49ae3a65f;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix #66479: Wrong response to FCGI_GET_VALUES
---

ac3a4e420036d125bc2f3e8ecba42de49ae3a65f
diff --cc NEWS
index 847ddd8765,7a15879ebf..eaa587b7a3
--- a/NEWS
+++ b/NEWS
@@@ -1,28 -1,26 +1,29 @@@
 -PHP                                                                        NEWS
 +PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2015, PHP 5.5.22
 +?? Feb 2015, PHP 5.6.6
  
  - Core:
-   . Fixed bug #68925 (Mitigation for CVE-2015-0235 – GHOST: glibc gethostbyname
-     buffer overflow). (Stas)
 -  . Fixed bug #67068 (getClosure returns somethings that's not a closure). 
 +  . Fixed bug #67068 (getClosure returns somethings that's not a closure).
      (Danack at basereality dot com)
+   . Fixed bug #68925 (Mitigation for CVE-2015-0235 – GHOST: glibc gethostbyname
+     buffer overflow). (Stas)
  
 -- Date:
 -  . Fixed bug #45081 (strtotime incorrectly interprets SGT time zone). (Derick)
 -  . Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat).
 -    (Derick, Felipe)
 -
  - Dba:
    . Fixed bug #68711 (useless comparisons). (bugreports at internot dot info)
  
 +- JSON:
 +  . Fixed bug #50224 (json_encode() does not always encode a float as a float)
 +    by adding JSON_PRESERVE_ZERO_FRACTION. (Juan Basso)
 +
  - Fileinfo:
    . Fixed bug #68827 (Double free with disabled ZMM). (Joshua Rogers)
 +  . Fixed bug #67647 (Bundled libmagic 5.17 does not detect quicktime files
 +    correctly). (Anatol)
 +  . Fixed bug #68731 (finfo_buffer doesn't extract the correct mime with some
 +    gifs). (Anatol)
  
  - FPM:
+   . Fixed bug #66479 (Wrong response to FCGI_GET_VALUES). (Frank Stolle)
    . Fixed bug #68571 (core dump when webserver close the socket).
      (redfoxli069 at gmail dot com, Laruence)