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

Merge branch 'PHP-7.0' into PHP-7.1
---

44d734254a7a58d484023fb5026f1f9a640c619a
diff --cc NEWS
index 8230e6efa7,f215ab8dd7..2a57c8977c
--- a/NEWS
+++ b/NEWS
@@@ -22,7 -11,13 +22,13 @@@ PH
  - SPL:
    . Fixed bug #73471 (PHP freezes with AppendIterator). (jhdxr)
  
+ - 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.0.21
 +06 Jul 2017, PHP 7.1.7
  
  - Core:
    . Fixed bug #74738 (Multiple [PATH=] and [HOST=] sections not properly