Skip to content

[stable17] Enable fseek for files in S3 storage #20966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 5 commits into from
May 25, 2020
Merged

[stable17] Enable fseek for files in S3 storage #20966

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4611577
Enable fseek for files in S3 storage
ahti Jan 22, 2020
2ecf23a
make seekable s3 stream generic
icewind1991 Mar 19, 2020
2356088
add basic tests for s3 seeking and add some error handling if reopen …
icewind1991 Mar 19, 2020
44ea3b8
update autoloader
icewind1991 Apr 1, 2020
e471c37
harden seekable http stream a bit against failures
icewind1991 Apr 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
harden seekable http stream a bit against failures 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @MorrisJobke
icewind1991 authored and MorrisJobke committed May 22, 2020
commit e471c37b9b8f9a45f59a1eb5acd40bf1f6cc9231
16 changes: 13 additions & 3 deletions lib/private/Files/Stream/SeekableHttpStream.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,15 +149,25 @@ public function stream_tell() {
}

public function stream_stat() {
return fstat($this->current);
if (is_resource($this->current)) {
return fstat($this->current);
} else {
return false;
}
}

public function stream_eof() {
return feof($this->current);
if (is_resource($this->current)) {
return feof($this->current);
} else {
return true;
}
}

public function stream_close() {
fclose($this->current);
if (is_resource($this->current)) {
fclose($this->current);
}
}

public function stream_write($data) {
Expand Down