mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10595 from owncloud/swift-stream 

Stream downloads from Swift object stores without downloading it first
This commit is contained in:
Jörn Friedrich Dreyer 2014-08-25 11:26:39 +02:00
parent adca48aa93 191a82e768
commit ebf7758d10
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/private/files/objectstore/swift.php
View File

@ -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;
}
/**