diff options
| author | Joe Watkins <krakjoe@php.net> | 2019-10-03 06:51:33 +0200 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-10-03 06:51:56 +0200 |
| commit | de83036f13cb48381f61d804cfdffbae8605c1f0 (patch) | |
| tree | dcfc6a47686b5fdcdfdcea45dffbd8d416d0e7fa /main/streams/filter.c | |
| parent | a46bdcb6319306131fbb33a7721a1ede742e8421 (diff) | |
| parent | 5b1bb23edfbdf00cfafa9655cf07ef99546cdfa8 (diff) | |
| download | php-git-de83036f13cb48381f61d804cfdffbae8605c1f0.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #76859 stream_get_line skips data if used with data-generating filter
Diffstat (limited to 'main/streams/filter.c')
| -rw-r--r-- | main/streams/filter.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/main/streams/filter.c b/main/streams/filter.c index 7fdbd0c3bf..f536b92a02 100644 --- a/main/streams/filter.c +++ b/main/streams/filter.c @@ -360,8 +360,6 @@ PHPAPI int php_stream_filter_append_ex(php_stream_filter_chain *chain, php_strea case PSFS_PASS_ON: /* If any data is consumed, we cannot rely upon the existing read buffer, as the filtered data must replace the existing data, so invalidate the cache */ - /* note that changes here should be reflected in - main/streams/streams.c::php_stream_fill_read_buffer */ stream->writepos = 0; stream->readpos = 0; |