diff options
author | Sara Golemon <pollita@php.net> | 2017-11-06 17:41:09 -0500 |
---|---|---|
committer | Sara Golemon <pollita@php.net> | 2017-11-06 17:41:09 -0500 |
commit | e36244e7763f4671f7cc36bb23f37db825d2ce67 (patch) | |
tree | a1727b70c8a215c1fbd8cf4907cfd8850a5b922d /main/streams/streams.c | |
parent | 24fd49fbabc7c5ad941095f33d05fe2e41ff667d (diff) | |
parent | 5060fc2349447fe17b59184a0147e73feb0e7a30 (diff) | |
download | php-git-e36244e7763f4671f7cc36bb23f37db825d2ce67.tar.gz |
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixes #68948 related to a BC break introduced by #68532 fix.
Diffstat (limited to 'main/streams/streams.c')
-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 1f82871ab3..ec6cf21807 100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -705,7 +705,7 @@ PHPAPI size_t _php_stream_read(php_stream *stream, char *buf, size_t size) } /* just break anyway, to avoid greedy read */ - if (stream->wrapper != &php_plain_files_wrapper) { + if (!stream->wrapper || stream->wrapper->is_url) { break; } } |