Skip to content

Commit d3e6feb

Browse files
authored
Merge pull request #15203 from nextcloud/backport/15168/stable16
[stable16] Always use a temp file for swift writes
2 parents 621a872 + b6fe0f1 commit d3e6feb

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

lib/private/Files/ObjectStore/Swift.php

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,9 @@ public function getStorageId() {
7676
* @throws \Exception from openstack lib when something goes wrong
7777
*/
7878
public function writeObject($urn, $stream) {
79-
$handle = $stream;
80-
81-
$meta = stream_get_meta_data($stream);
82-
if (!(isset($meta['seekable']) && $meta['seekable'] === true)) {
83-
$tmpFile = \OC::$server->getTempManager()->getTemporaryFile('swiftwrite');
84-
file_put_contents($tmpFile, $stream);
85-
$handle = fopen($tmpFile, 'rb');
86-
}
79+
$tmpFile = \OC::$server->getTempManager()->getTemporaryFile('swiftwrite');
80+
file_put_contents($tmpFile, $stream);
81+
$handle = fopen($tmpFile, 'rb');
8782

8883
$this->getContainer()->createObject([
8984
'name' => $urn,

0 commit comments

Comments
 (0)