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

Merge branch 'PHP-7.1'

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

2030b59829a6a16f0cefe2c3e4d1b9feed080b42
diff --cc NEWS
index 9c6e8cb23a,0965dcd20b..ef29b00f8f
--- a/NEWS
+++ b/NEWS
@@@ -6,14 -6,33 +6,17 @@@ 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.1.7
 +22 Jun 2017, PHP 7.2.0alpha2
  
  - Core:
 -  . Fixed bug #74738 (Multiple [PATH=] and [HOST=] sections not properly
 -    parsed). (Manuel Mausz)
 -  . Fixed bug #74658 (Undefined constants in array properties result in broken
 -    properties). (Laruence)
 -  . Fixed misparsing of abstract unix domain socket names. (Sara)
 -
 -- Date:
 -  . Fixed bug #74639 (implement clone for DatePeriod and DateInterval).
 -    (andrewnester)
 -
 -- DOM:
 -  . Fixed bug #69373 (References to deleted XPath query results). (ttoohey)
 -
 -- Intl:
 -  . Fixed bug #73473 (Stack Buffer Overflow in msgfmt_parse_message). (libnex)
 -  . Fixed bug #74705 (Wrong reflection on Collator::getSortKey and
 -    collator_get_sort_key). (Tyson Andre, Remi)
 +  . Change PHP_OS_FAMILY value from "OSX" to "Darwin". (sb, kalle)
  
 -- Mbstring:
 -  . Add oniguruma upstream fix (CVE-2017-9224, CVE-2017-9226, CVE-2017-9227,
 -    CVE-2017-9228, CVE-2017-9229) (Remi, Mamoru TASAKA)
 +- GD:
 +  . Fixed bug #74744 (gd.h: stdarg.h include missing for va_list use in
 +    gdErrorMethod). (rainer dot jung at kippdata dot de, cmb)
  
  - OCI8:
    . Add TAF callback (PR #2459). (KoenigsKind)