summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-12-08 11:49:41 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2020-12-08 11:49:41 +0100
commit615197ae3d3a1f22173310ea80bbef40950a89c4 (patch)
tree3f34bd7fa2bad56f225b69fa00dacd629e19fbec /main
parent748d553c241b1379ff7f01a335d5f97332013f01 (diff)
parentd6ae0f010ec6bc4713dc9fe79e79947c2404a8dd (diff)
downloadphp-git-615197ae3d3a1f22173310ea80bbef40950a89c4.tar.gz
Merge branch 'PHP-8.0'
* PHP-8.0: Fix #77069: stream filter loses final block of data
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 1262c874f7..0524bd28a2 100644
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -565,7 +565,7 @@ PHPAPI int _php_stream_fill_read_buffer(php_stream *stream, size_t size)
/* after this call, bucket is owned by the brigade */
php_stream_bucket_append(brig_inp, bucket);
- flags = PSFS_FLAG_NORMAL;
+ flags = stream->eof ? PSFS_FLAG_FLUSH_CLOSE : PSFS_FLAG_NORMAL;
} else {
flags = stream->eof ? PSFS_FLAG_FLUSH_CLOSE : PSFS_FLAG_FLUSH_INC;
}