diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-08-22 14:11:21 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-08-22 14:11:36 +0200 |
| commit | 191a82e768157b5a95269dc80283b59e03212c56 (patch) | |
| tree | 9f1e6968439519bf5a57e3ca72aafc5fbd6bf142 /lib/private/files/objectstore/swift.php | |
| parent | 9c980954f4cbb0ff023f5065d64b3eb931914be0 (diff) | |
| download | nextcloud-server-191a82e768157b5a95269dc80283b59e03212c56.tar.gz nextcloud-server-191a82e768157b5a95269dc80283b59e03212c56.zip | |
Stream downloads from Swift object stores without downloading it first
Diffstat (limited to 'lib/private/files/objectstore/swift.php')
| -rw-r--r-- | lib/private/files/objectstore/swift.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/private/files/objectstore/swift.php b/lib/private/files/objectstore/swift.php index 3378fd7b86f..1e8dd6a7401 100644 --- a/lib/private/files/objectstore/swift.php +++ b/lib/private/files/objectstore/swift.php @@ -120,12 +120,11 @@ class Swift implements IObjectStore { $objectContent = $object->getContent(); $objectContent->rewind(); - // directly returning the object stream does not work because the GC seems to collect it, so we need a copy - $tmpStream = fopen('php://temp', 'r+'); - stream_copy_to_stream($objectContent->getStream(), $tmpStream); - rewind($tmpStream); + $stream = $objectContent->getStream(); + // save the object content in the context of the stream to prevent it being gc'd until the stream is closed + stream_context_set_option($stream, 'swift','content', $objectContent); - return $tmpStream; + return $stream; } /** |