diff options
| author | Robin Appelman <robin@icewind.nl> | 2016-11-18 14:55:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-18 14:55:07 +0100 |
| commit | 8b9ad46ba3ef876f00dc6bdadd7b51d7b1fa1c78 (patch) | |
| tree | bc9c6a21ddc68656d8fd93c67f11b754a358afdb /lib/private/AppFramework/Http | |
| parent | 6c11c54434b29bb9f7f07ba9a8070ed8308bc5a4 (diff) | |
| parent | 4ac5fdcf11b0ca7dd985d50a91393a1c185821ff (diff) | |
| download | nextcloud-server-8b9ad46ba3ef876f00dc6bdadd7b51d7b1fa1c78.tar.gz nextcloud-server-8b9ad46ba3ef876f00dc6bdadd7b51d7b1fa1c78.zip | |
Merge pull request #768 from nextcloud/s3-objectstore
Add S3 objectstore backend
Diffstat (limited to 'lib/private/AppFramework/Http')
| -rw-r--r-- | lib/private/AppFramework/Http/Output.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/private/AppFramework/Http/Output.php b/lib/private/AppFramework/Http/Output.php index 85f0e6f8feb..1d77350b1a2 100644 --- a/lib/private/AppFramework/Http/Output.php +++ b/lib/private/AppFramework/Http/Output.php @@ -48,12 +48,17 @@ class Output implements IOutput { } /** - * @param string $path + * @param string|resource $path or file handle * * @return bool false if an error occurred */ public function setReadfile($path) { - return @readfile($path); + if (is_resource($path)) { + $output = fopen('php://output', 'w'); + return stream_copy_to_stream($path, $output) > 0; + } else { + return @readfile($path); + } } /** |