sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use a tmp file for swift writes 

Else this leads to a seekable stream error with chunked uploads

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
pull/14424/head
Roeland Jago Douma 2019-02-27 22:03:54 +07:00
parent aa69b9d67d
commit 1153123b90
No known key found for this signature in database
GPG Key ID: F941078878347C0C
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/private/Files/ObjectStore/Swift.php
Unescape Escape View File

@ -76,9 +76,18 @@ class Swift implements IObjectStore {
* @throws \Exception from openstack lib when something goes wrong
*/
public function writeObject($urn, $stream) {
$handle = $stream;
$meta = stream_get_meta_data($stream);
if (!(isset($meta['seekable']) && $meta['seekable'] === true)) {
$tmpFile = \OC::$server->getTempManager()->getTemporaryFile('swiftwrite');
file_put_contents($tmpFile, $stream);
$handle = fopen($tmpFile, 'rb');
}
$this->getContainer()->createObject([
'name' => $urn,
'stream' => stream_for($stream)
'stream' => stream_for($handle)
]);
}