Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix bug #73037, second round
This commit is contained in:
Anatol Belski 2016-10-05 15:04:55 +02:00
commit d5b77d6662

View File

@ -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) {