From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sat, 8 Sep 2018 17:08:59 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.3.0RC1~14^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa70b91a4f71ff6ed9dabde868b785267ae9d189;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #75273: php_zlib_inflate_filter() may not update bytes_consumed
---

fa70b91a4f71ff6ed9dabde868b785267ae9d189
diff --cc NEWS
index 932a36a755,10a8438963..b0f169c4cf
--- a/NEWS
+++ b/NEWS
@@@ -21,7 -19,11 +21,11 @@@ PH
    . Fixed bug #74764 (Bindto IPv6 works with file_get_contents but fails with 
      stream_socket_client). (Ville Hukkamäki)
  
+ - Zlib:
+   . Fixed bug #75273 (php_zlib_inflate_filter() may not update bytes_consumed).
+     (Martin Burke, cmb)
+ 
 -13 Sep 2018, PHP 7.1.22
 +13 Sep 2018, PHP 7.2.10
  
  - Core:
    . Fixed bug #76754 (parent private constant in extends class memory leak).