summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2021-02-22 15:31:49 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2021-02-22 15:32:17 +0100
commitb418fe266dd3ab56358469ed8290187959bad1a7 (patch)
treee178ca08896c572e1df488e1f44a65dc3c67d236 /main
parent1d2bbce532a4383210e97ce6b00e210ef2cbaae7 (diff)
parent963e50c8c48ecfbe7444445e5ca8e33530d630d0 (diff)
downloadphp-git-b418fe266dd3ab56358469ed8290187959bad1a7.tar.gz
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4: Fix #75776: Flushing streams with compression filter is broken
Diffstat (limited to 'main')
-rw-r--r--main/streams/streams.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c
index 86522afa84..e5e90e0f4d 100644
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -443,7 +443,7 @@ fprintf(stderr, "stream_free: %s:%p[%s] preserve_handle=%d release_cast=%d remov
(close_options & PHP_STREAM_FREE_RSRC_DTOR) == 0);
#endif
- if (stream->flags & PHP_STREAM_FLAG_WAS_WRITTEN) {
+ if (stream->flags & PHP_STREAM_FLAG_WAS_WRITTEN || stream->writefilters.head) {
/* make sure everything is saved */
_php_stream_flush(stream, 1);
}