From: Joe Watkins <krakjoe@php.net>
Date: Thu, 22 Jun 2017 10:57:22 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha3~56^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c56378b0d5ae2f9488a60d16cec58d50b11cc4ac;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix bug #73471 PHP freezes with AppendIterator
---

c56378b0d5ae2f9488a60d16cec58d50b11cc4ac
diff --cc NEWS
index f77fa5fcc6,75da8063fe..0965dcd20b
--- a/NEWS
+++ b/NEWS
@@@ -6,7 -6,10 +6,10 @@@ PH
    . Fixed bug #74780 (parse_url() borken when query string contains colon). 
      (jhdxr)
  
+ - SPL:
+   . Fixed bug #73471 (PHP freezes with AppendIterator). (jhdxr)
+ 
 -06 Jul 2017 PHP 7.0.21
 +06 Jul 2017, PHP 7.1.7
  
  - Core:
    . Fixed bug #74738 (Multiple [PATH=] and [HOST=] sections not properly