diff options
| author | Joe Watkins <krakjoe@php.net> | 2019-10-03 06:50:58 +0200 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-10-03 06:51:10 +0200 |
| commit | 5b1bb23edfbdf00cfafa9655cf07ef99546cdfa8 (patch) | |
| tree | 813e5d8700e4855544487414007849ebfff51e26 /main/streams/streams.c | |
| parent | 0505fbf2e5074cff8d0ecab504aa3e563c49858b (diff) | |
| parent | 05560b67bc87a2bcbfd5b48a48443a62f3311e7d (diff) | |
| download | php-git-5b1bb23edfbdf00cfafa9655cf07ef99546cdfa8.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #76859 stream_get_line skips data if used with data-generating filter
Diffstat (limited to 'main/streams/streams.c')
| -rw-r--r-- | main/streams/streams.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c index 4b9c344dd2..a2c716e17c 100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -524,10 +524,6 @@ PHPAPI void _php_stream_fill_read_buffer(php_stream *stream, size_t size) php_stream_bucket_brigade brig_in = { NULL, NULL }, brig_out = { NULL, NULL }; php_stream_bucket_brigade *brig_inp = &brig_in, *brig_outp = &brig_out, *brig_swap; - /* Invalidate the existing cache, otherwise reads can fail, see note in - main/streams/filter.c::_php_stream_filter_append */ - stream->writepos = stream->readpos = 0; - /* allocate a buffer for reading chunks */ chunk_buf = emalloc(stream->chunk_size); |