From: Bob Weinand <bobwei9@hotmail.com>
Date: Sun, 25 Jun 2017 18:15:31 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha3~34^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a1755671e271383903285cb986b8a75d32b73cd3;p=php

Merge branch 'PHP-7.1'
---

a1755671e271383903285cb986b8a75d32b73cd3
diff --cc NEWS
index bed8ed29ad,2a57c8977c..05a8ef5f55
--- a/NEWS
+++ b/NEWS
@@@ -16,18 -22,36 +16,24 @@@ PH
  - SPL:
    . Fixed bug #73471 (PHP freezes with AppendIterator). (jhdxr)
  
 +- Standard:
 +  . Add support for extension name as argument to dl().
 +    (francois at tekwire dot net)
 +
+ - zlib:
+   . Fixed bug #73944 (dictionary option of inflate_init() does not work).
+     (wapmorgan)
+   . Expose inflate_get_status() and inflate_get_read_len() functions.
+     (Matthew Trescott)
+ 
 -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)