Stream downloads from Swift object stores without downloading it first

remotes/origin/fix-10825
Robin Appelman 12 years ago
parent 9c980954f4
commit 191a82e768
  1. 9
      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;
}
/**

Loading…
Cancel
Save