mirror of
https://github.com/php/php-src.git
synced 2024-09-22 10:27:25 +00:00
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: Fix bug #73037, second round
This commit is contained in:
commit
5b79e95f7b
@ -90,7 +90,11 @@ static size_t php_stream_input_read(php_stream *stream, char *buf, size_t count)
|
||||
}
|
||||
}
|
||||
|
||||
php_stream_seek(input->body, input->position, SEEK_SET);
|
||||
if (!input->body->readfilters.head) {
|
||||
/* If the input stream contains filters, it's not really seekable. The
|
||||
input->position is likely to be wrong for unfiltered data. */
|
||||
php_stream_seek(input->body, input->position, SEEK_SET);
|
||||
}
|
||||
read = php_stream_read(input->body, buf, count);
|
||||
|
||||
if (!read || read == (size_t) -1) {
|
||||
|
Loading…
Reference in New Issue
Block a user