From: Nikita Popov <nikic@php.net>
Date: Sat, 20 Sep 2014 19:47:16 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.4RC1~59^2~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=308c0a727ec496ff551f67052b0835de3c152c11;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

308c0a727ec496ff551f67052b0835de3c152c11
diff --cc NEWS
index 1385cde117,50d2707e6c..a4b0da49a0
--- a/NEWS
+++ b/NEWS
@@@ -1,9 -1,14 +1,12 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2014, PHP 5.5.18
 +?? ??? 2014, PHP 5.6.2
  
+ - Core:
 -  . Fixed bug #67985 (Incorrect last used array index copied to new array after
 -    unset). (Tjerk)
    . Fixed bug #67739 (Windows 8.1/Server 2012 R2 OS build number reported
      as 6.2 (instead of 6.3)). (Christian Wenz)
+   . Fixed bug #67633 (A foreach on an array returned from a function not doing
+     copy-on-write). (Nikita)
  
  - FPM:
    . Fixed bug #65641 (PHP-FPM incorrectly defines the SCRIPT_NAME variable