From: Michael Wallner <mike@php.net>
Date: Thu, 21 Aug 2014 20:44:34 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_64BIT_BRANCH_MERGE~1^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b82c4e52063e74abaca637811629b521754de3d;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix bug #67865
  updated NEWS to fit last release
  NEWS
  Fix bug #67878 program_prefix not honoured in man pages
---

3b82c4e52063e74abaca637811629b521754de3d
diff --cc NEWS
index ab30d13209,d374dfebf6..70780ce068
--- a/NEWS
+++ b/NEWS
@@@ -1,28 -1,45 +1,31 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2014, PHP 5.5.17
 +?? ??? 2014, PHP 5.6.0 ???
  
  - Core:
 -  . Fixed bug #47358 (glob returns error, should be empty array()). (Pierre)
    . Fixed bug #67878 (program_prefix not honoured in man pages). (Remi)
  
 -- COM:
 -  . Fixed bug #41577 (DOTNET is successful once per server run)
 -    (Aidas Kasparas)
 -
 -- OpenSSL:
 -  . Fixed bug #41631 (socket timeouts not honored in blocking SSL reads).
 -    (Daniel Lowrey)
 -
 -- SPL:
 -  . Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException
 -    wrong message). (tim_siebels_aurich at yahoo dot de)
 -
 -- Date:
 -  . Fixed bug #66091 (memory leaks in DateTime constructor). (Tjerk)
 -  . Fixed bug #66985 (Some timezones are no longer valid in PHP 5.5.10).
 -    (Derick)
 -  . Fixed bug #67109 (First uppercase letter breaks date string parsing).
 -    (Derick)
 +- Fileinfo:
 +  . Fixed bug #67716 (Segfault in cdf.c). (CVE-2014-3587) (Remi)
  
  - GD
 -  . Made fontFetch's path parser thread-safe. (Sara).
 -
 -- MySQLi:
 -  . Fixed bug #67839 (mysqli does not handle 4-byte floats correctly). (Keyur)
 +  . Made fontFetch's path parser thread-safe. (Sara)
 +  . Fixed bug #67730 (Null byte injection possible with imagexxx functions).
 +    (CVE-2014-5120) (Ryan Mauger)
  
+ - Zlib:
 -  . Fixed bug #67724 (chained zlib filters silently fail with large amounts of 
 -    data). (Mike)
+   . Fixed bug #67865 (internal corruption phar error). Mike
+ 
 -21 Aug 2014, PHP 5.5.16
 +14 Aug 2014, PHP 5.6.0 Release Candidate 4
  
  - COM:
 -  . Fixed missing type checks in com_event_sink (Yussuf Khalil, Stas).
 +  . Fixed bug #41577 (DOTNET is successful once per server run)
 +    (Aidas Kasparas)
 +
 +- Core:
 +  . Fixed bug #67693 (incorrect push to the empty array). (Tjerk)
 +  . Removed inconsistency regarding behaviour of array in constants at
 +    run-time. (Bob)
  
  - Fileinfo:
    . Fixed bug #67705 (extensive backtracking in rule regular expression).