Merge branch 'PHP-7.1' into PHP-7.2

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

diff --cc NEWS
index 932a36a755b2ae4d968285ea6a496762ef6a72d8,10a8438963ed9ea99b8b4a56c475328769bf7a83..b0f169c4cfb20ee277137dd69a54c24f3dac2676
--- 1/NEWS
--- 2/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)
  
 -13 Sep 2018, PHP 7.1.22
+ - Zlib:
+   . Fixed bug #75273 (php_zlib_inflate_filter() may not update bytes_consumed).
+     (Martin Burke, cmb)
+ 
 +13 Sep 2018, PHP 7.2.10
  
  - Core:
    . Fixed bug #76754 (parent private constant in extends class memory leak).

diff --cc ext/zlib/zlib_filter.c
Simple merge