summaryrefslogtreecommitdiffstats
path: root/lib/private/AppFramework
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2016-10-27 14:46:28 +0200
committerRobin Appelman <robin@icewind.nl>2016-11-16 15:30:36 +0100
commit4235b18a889cd9d1b306ea410ed8e8ec307730c1 (patch)
treef54609adf9eebfbee27d66e8e791a8a67a58619c /lib/private/AppFramework
parent0ee958595e42bc29543e294958b2090b80f85d2d (diff)
downloadnextcloud-server-4235b18a889cd9d1b306ea410ed8e8ec307730c1.tar.gz
nextcloud-server-4235b18a889cd9d1b306ea410ed8e8ec307730c1.zip
allow passing a stream to StreamResponse
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib/private/AppFramework')
-rw-r--r--lib/private/AppFramework/Http/Output.php9
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);
+ }
}
/**