Skip to content

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

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

Closed
backportbot-nextcloud wants to merge 5 commits into from
Closed

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

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2f414b9
Enable fseek for files in S3 storage
ahti Jan 22, 2020
f30da82
make seekable s3 stream generic
icewind1991 Mar 19, 2020
1082ced
add basic tests for s3 seeking and add some error handling if reopen …
icewind1991 Mar 19, 2020
e6bbc92
update autoloader
icewind1991 Apr 1, 2020
aa39d8c
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 @backportbot
icewind1991 authored and backportbot[bot] committed May 25, 2020
commit aa39d8c8af5ec8cdf0890b00afffcf047e3278b5
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