From: Matteo Beccati <mbeccati@php.net>
Date: Wed, 12 Nov 2014 10:21:40 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.4RC1~55^2~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07655ffe7e86ad6505cf67b2c093dc59e87d0b01;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #53829 Compiling PHP with large file support will replace function gzopen by gzopen64
---

07655ffe7e86ad6505cf67b2c093dc59e87d0b01
diff --cc NEWS
index 221e4e7480,fa1ec8a3ab..0244507857
--- a/NEWS
+++ b/NEWS
@@@ -1,27 -1,21 +1,29 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2014, PHP 5.5.20
 -
 -- Core:
 -  . Fixed bug #68370 ("unset($this)" can make the program crash). (Laruence)
 +?? ??? 2014, PHP 5.6.4
  
- 
+ - zlib:
+   . Fixed bug #53829 (Compiling PHP with large file support will replace
+     function gzopen by gzopen64) (Sascha Kettler, Matteo)
  
 -13 Nov 2014, PHP 5.5.19
 +13 Nov 2014, PHP 5.6.3
  
  - Core:
 -  . Fixed bug #68095 (AddressSanitizer reports a heap buffer overflow in 
 +  . Fixed bug #68370 ("unset($this)" can make the program crash). (Laruence)
 +  . Fixed bug #68104 (Segfault while pre-evaluating a disabled function).
 +    (Laruence)
 +  . Implemented 64-bit format codes for pack() and unpack(). (Leigh)
 +  . Fixed bug #51800 (proc_open on Windows hangs forever). (Anatol)
 +  . Fixed bug #67633 (A foreach on an array returned from a function not doing
 +    copy-on-write). (Nikita)
 +  . Fixed bug #67739 (Windows 8.1/Server 2012 R2 OS build number reported
 +    as 6.2 (instead of 6.3)). (Christian Wenz)
 +  . Fixed bug #67949 (DOMNodeList elements should be accessible through
 +    array notation) (Florian)
 +  . Fixed bug #68095 (AddressSanitizer reports a heap buffer overflow in
      php_getopt()). (Stas)
    . Fixed bug #68118 ($a->foo .= 'test'; can leave $a->foo undefined). (Nikita)
 -  . Fixed bug #68129 (parse_url() - incomplete support for empty usernames
 +  . Fixed bug #68129 (parse_url() - incomplete support for empty usernames 
      and passwords) (Tjerk)
    . Fixed bug #68365 (zend_mm_heap corrupted after memory overflow in
      zend_hash_copy). (Dmitry)