mirror of
https://github.com/php/php-src.git
synced 2025-08-15 21:48:51 +02:00
Merge branch 'PHP-7.4' into master
* PHP-7.4: Fix #80048: Bug #69100 has not been fixed for Windows
This commit is contained in:
commit
c7cba01b88
1 changed files with 4 additions and 8 deletions
|
@ -811,15 +811,11 @@ static int php_stdiop_set_option(php_stream *stream, int option, int value, void
|
|||
}
|
||||
|
||||
size = GetFileSize(hfile, NULL);
|
||||
if (range->length == 0 && range->offset > 0 && range->offset < size) {
|
||||
range->length = size - range->offset;
|
||||
}
|
||||
if (range->length == 0 || range->length > size) {
|
||||
range->length = size;
|
||||
}
|
||||
if (range->offset >= size) {
|
||||
if (range->offset > size) {
|
||||
range->offset = size;
|
||||
range->length = 0;
|
||||
}
|
||||
if (range->length == 0 || range->length > size - range->offset) {
|
||||
range->length = size - range->offset;
|
||||
}
|
||||
|
||||
/* figure out how big a chunk to map to be able to view the part that we need */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue