Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #77069: stream filter loses final block of data

diff --cc NEWS
index 923fe715efc7590a3209fb0ea2bcd1a69892f97e,0de562eeaff04c92ce9a023bac3ffc1081875090..a776b3faf44b9866daa685b0a7d05559d0c103b2
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -6,9 -6,14 +6,10 @@@ PH
    . Fixed bug #80345 (PHPIZE configuration has outdated PHP_RELEASE_VERSION).
      (cmb)
    . Fixed bug #72964 (White space not unfolded for CC/Bcc headers). (cmb)
 -  . Fixed bug #80362 (Running dtrace scripts can cause php to crash).
 -    (al at coralnet dot name)
 +  . Fixed bug #80391 (Iterable not covariant to mixed). (Nikita)
    . Fixed bug #80393 (Build of PHP extension fails due to configuration gap
      with libtool). (kir dot morozov at gmail dot com)
 -  . Fixed bug #80402 (configure filtering out -lpthread). (Nikita)
+   . Fixed bug #77069 (stream filter loses final block of data). (cmb)
  
  - Fileinfo:
    . Fixed bug #77961 (finfo_open crafted magic parsing SIGABRT). (cmb)

diff --cc ext/zlib/zlib_filter.c
index cffa65f488df24ae8bed69816f6591c7fb4d4ff8,3c19d380169a1f8b94d75c62910811729ba5f7e3..0ed0c2713a39ed048c613aa1c35521a133009f26
--- 1/ext/zlib/zlib_filter.c
--- 2/ext/zlib/zlib_filter.c
+++ b/ext/zlib/zlib_filter.c
@@@ -88,9 -90,8 +88,9 @@@ static php_stream_filter_status_t php_z
                                inflateEnd(&(data->strm));
                                data->finished = '\1';
                                exit_status = PSFS_PASS_ON;
-                       } else if (status != Z_OK) {
+                       } else if (status != Z_OK && status != Z_BUF_ERROR) {
                                /* Something bad happened */
 +                              php_error_docref(NULL, E_NOTICE, "zlib: %s", zError(status));
                                php_stream_bucket_delref(bucket);
                                /* reset these because despite the error the filter may be used again */
                                data->strm.next_in = data->inbuf;

diff --cc main/streams/streams.c
Simple merge