From: Will Fitch <willfitch@php.net>
Date: Sat, 18 Jan 2014 16:39:32 +0000 (-0500)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~12^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=767e6d2e08afad2ac5e019b08a8875ffd2496206;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #66509: copy() arginfo incorrect since 5.4

Conflicts:
	NEWS
---

767e6d2e08afad2ac5e019b08a8875ffd2496206
diff --cc NEWS
index 2f098bf9c6,00a0a940ad..ce2d100799
--- a/NEWS
+++ b/NEWS
@@@ -1,48 -1,21 +1,51 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2013, PHP 5.4.25
 +?? ??? 2014, PHP 5.5.9
  
+ - Core:
 -  . Fixed bug #66286 (Incorrect object comparison with inheritance). (Nikita)
+   . Fixed bug #66509 (copy() arginfo has changed starting from 5.4). (willfitch)
+ 
 -- Session:
 -  . Fixed bug #66481 (Calls to session_name() segfault when session.name is
 -    null). (Laruence)
 +- GD:
 +  . Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop()).
 +    (Laruence, Remi)
 +
 +- OPCache:
 +  . Fixed bug #66474 (Optimizer bug in constant string to boolean conversion).
 +    (Dmitry)
 +  . Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0).
 +    (Dmitry)
 +  . Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style 
 +    ^M as lineend). (Laruence)
 +
 +- Session
 +  . Fixed bug #66469 (Session module is sending multiple set-cookie headers when
 +    session.use_strict_mode=1) (Yasuo)
 +  . Fixed bug #66481 (Segfaults on session_name()).
 +    (cmcdermottroe at engineyard dot com, Yasuo)
 +
 +- Standard
 +  . Fixed bug #66395 (basename function doesn't remove drive letter). (Anatol)
  
 -?? ??? 2013, PHP 5.4.24
 +- Sockets:
 +  . Fixed bug #66381 (__ss_family was changed on AIX 5.3). (Felipe)
 +
 +- Zend Engine
 +  . Fixed bug #66009 (Failed compilation of PHP extension with C++ std
 +    library using VS 2012). (Anatol)
 +
 +09 Jan 2014, PHP 5.5.8
  
  - Core:
 +  . Disallowed JMP into a finally block. (Laruence)
    . Added validation of class names in the autoload process. (Dmitry)
    . Fixed invalid C code in zend_strtod.c. (Lior Kaplan)
 +  . Fixed ZEND_MM_MEM_TYPE=mmap_zero. (Dmitry, Tony)
 +  . Fixed bug #66041 (list() fails to unpack yielded ArrayAccess object).
 +    (Nikita)
 +  . Fixed bug #65764 (generators/throw_rethrow FAIL with
 +    ZEND_COMPILE_EXTENDED_INFO). (Nikita)
    . Fixed bug #61645 (fopen and O_NONBLOCK). (Mike)
 +  . Fixed bug #66218 (zend_register_functions breaks reflection). (Remi)
  
  - Date:
    . Fixed bug #66060 (Heap buffer over-read in DateInterval). (Remi)