From: Joe Watkins <krakjoe@php.net>
Date: Tue, 2 May 2017 05:24:59 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.6RC1~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6bd30e8f1a12f062f13013796d736847c827d1a4;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix bug #74457 Wrong reflection on XMLReader::expand
---

6bd30e8f1a12f062f13013796d736847c827d1a4
diff --cc NEWS
index 959298f1a9,2a05eae0a7..14bfe90494
--- a/NEWS
+++ b/NEWS
@@@ -5,17 -5,15 +5,20 @@@ PH
  - intl:
    . Fixed bug #74468 (wrong reflection on Collator::sortWithSortKeys). (villfa)
  
+ - xmlreader:
+   . Fixed bug #74457 (Wrong reflection on XMLReader::expand). (villfa)
+ 
 -11 May 2017 PHP 7.0.19
 +11 May 2017, PHP 7.1.5
  
  - Core:
 +  . Fixed bug #74408 (Endless loop bypassing execution time limit). (Laruence)
 +  . Fixed bug #74353 (Segfault when killing within bash script trap code).
 +    (Laruence)
 +  . Fixed bug #74340 (Magic function __get has different behavior in php 7.1.x).
 +    (Nikita)
    . Fixed bug #74188 (Null coalescing operator fails for undeclared static
      class properties). (tpunt)
 -  . Fixed bug #74408 (Endless loop bypassing execution time limit). (Laruence)
 +  . Fixed bug #74444 (multiple catch freezes in some cases). (David Matějka)
    . Fixed bug #74410 (stream_select() is broken on Windows Nanoserver).
      (Matt Ficken)
    . Fixed bug #74337 (php-cgi.exe crash on facebook callback).