From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Tue, 8 Dec 2020 10:49:14 +0000 (+0100)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d6ae0f010ec6bc4713dc9fe79e79947c2404a8dd;p=php

Merge branch 'PHP-7.4' into PHP-8.0

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

d6ae0f010ec6bc4713dc9fe79e79947c2404a8dd
diff --cc NEWS
index 923fe715ef,0de562eeaf..a776b3faf4
--- a/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 cffa65f488,3c19d38016..0ed0c2713a
--- a/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;