diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-12-08 11:49:14 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-12-08 11:49:28 +0100 |
| commit | d6ae0f010ec6bc4713dc9fe79e79947c2404a8dd (patch) | |
| tree | 2963778368adb89c953b06387f37acc460da0df9 /main | |
| parent | c3734f9ae182640ba6cc2fbd5724166b1b3d1275 (diff) | |
| parent | 65f5573bc82108bbaf2727ffa11575f3292d736f (diff) | |
| download | php-git-d6ae0f010ec6bc4713dc9fe79e79947c2404a8dd.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #77069: stream filter loses final block of data
Diffstat (limited to 'main')
| -rw-r--r-- | main/streams/streams.c | 2 |
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; } |