diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-04-04 21:15:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-04 21:15:34 +0200 |
| commit | 72b8784e2ab1b2d99303125d4c269757c49eb724 (patch) | |
| tree | 5c83faeac6d249bb1935e4ac53ba841130e12ee9 | |
| parent | 52eaf6cfbbffdfa6f86f0b0cef544198877b4bde (diff) | |
| parent | 30c95b51fba347e4855e5873c6cde59fcca7f2c6 (diff) | |
| download | nextcloud-server-72b8784e2ab1b2d99303125d4c269757c49eb724.tar.gz nextcloud-server-72b8784e2ab1b2d99303125d4c269757c49eb724.zip | |
Merge pull request #4204 from nextcloud/append-fixes-swift
fix fseek (Swift backend) against string not resource by removing append support
| -rw-r--r-- | apps/files_external/lib/Lib/Storage/Swift.php | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/apps/files_external/lib/Lib/Storage/Swift.php b/apps/files_external/lib/Lib/Storage/Swift.php index 5fec278ef3d..105d1073ae6 100644 --- a/apps/files_external/lib/Lib/Storage/Swift.php +++ b/apps/files_external/lib/Lib/Storage/Swift.php @@ -373,6 +373,10 @@ class Swift extends \OC\Files\Storage\Common { $path = $this->normalizePath($path); switch ($mode) { + case 'a': + case 'ab': + case 'a+': + return false; case 'r': case 'rb': try { @@ -395,12 +399,9 @@ class Swift extends \OC\Files\Storage\Common { } case 'w': case 'wb': - case 'a': - case 'ab': case 'r+': case 'w+': case 'wb+': - case 'a+': case 'x': case 'x+': case 'c': @@ -419,10 +420,6 @@ class Swift extends \OC\Files\Storage\Common { } $source = $this->fopen($path, 'r'); file_put_contents($tmpFile, $source); - // Seek to end if required - if ($mode[0] === 'a') { - fseek($tmpFile, 0, SEEK_END); - } } $handle = fopen($tmpFile, $mode); return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) { |