diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2019-02-27 22:03:54 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2019-03-04 13:11:59 +0100 |
| commit | 1153123b90c7082723513f84243131860bbc649d (patch) | |
| tree | 322f9361ea12c5751023bff7719da079635c0512 | |
| parent | aa69b9d67d9b8ed66e71378fe8cff5280c34b496 (diff) | |
| download | nextcloud-server-1153123b90c7082723513f84243131860bbc649d.tar.gz nextcloud-server-1153123b90c7082723513f84243131860bbc649d.zip | |
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>
| -rw-r--r-- | lib/private/Files/ObjectStore/Swift.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/private/Files/ObjectStore/Swift.php b/lib/private/Files/ObjectStore/Swift.php index 3d6bf9d69da..7e4654b6eb2 100644 --- a/lib/private/Files/ObjectStore/Swift.php +++ b/lib/private/Files/ObjectStore/Swift.php @@ -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) ]); } |