Merge branch 'PHP-7.2' into PHP-7.3

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

diff --cc NEWS
index 307fcb6550b3bb91e2a26fa5f1d0e1c014aec7e3,b0f169c4cfb20ee277137dd69a54c24f3dac2676..e85a3ef2d59692305fff8b2a4be695fa8453c405
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -27,26 -16,29 +27,30 @@@ PH
      (cmb)
  
  - Standard:
 +  . Fixed bug #76803 (ftruncate changes file pointer). (Anatol)
 +  . Fixed bug #76818 (Memory corruption and segfault). (Remi)
    . Fixed bug #73457 (Wrong error message when fopen FTP wrapped fails to open
      data connection). (Ville Hukkamäki)
 -  . Fixed bug #74764 (Bindto IPv6 works with file_get_contents but fails with 
 -    stream_socket_client). (Ville Hukkamäki)
  
 -13 Sep 2018, PHP 7.2.10
+ - Zlib:
+   . Fixed bug #75273 (php_zlib_inflate_filter() may not update bytes_consumed).
+     (Martin Burke, cmb)
+ 
 +30 Aug 2018, PHP 7.3.0beta3
  
  - Core:
 +  . Fixed #76773 (Traits used on the parent are ignored for child classes).
 +    (daverandom)
 +  . Fixed #76767 (‘asm’ operand has impossible constraints in zend_operators.h).
 +    (ondrej)
    . Fixed bug #76754 (parent private constant in extends class memory leak).
      (Laruence)
 -  . Fixed bug #72443 (Generate enabled extension). (petk)
 -  . Fixed bug #75797 (Memory leak when using class_alias() in non-debug mode).
 -    (Massimiliano Braglia)
 -
 -- Bz2:
 -  . Fixed arginfo for bzcompress. (Tyson Andre)
 +  . Fixed bug #76752 (Crash in ZEND_COALESCE_SPEC_TMP_HANDLER - assertion in
 +    _get_zval_ptr_tmp failed). (Laruence)
  
 -- gettext:
 -  . Fixed bug #76517 (incorrect restoring of LDFLAGS). (sji)
 +- DOM:
 +  . Fixed bug #76285 (DOMDocument::formatOutput attribute sometimes ignored).
 +    (Andrew Nester, Laruence, Anatol)
  
  - iconv:
    . Fixed bug #68180 (iconv_mime_decode can return extra characters in a 

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