mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4204 from nextcloud/append-fixes-swift 

fix fseek (Swift backend) against string not resource by removing append support
This commit is contained in:
Roeland Jago Douma 2017-04-04 21:15:34 +02:00 committed by GitHub
parent 52eaf6cfbb 30c95b51fb
commit 72b8784e2a
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/files_external/lib/Lib/Storage/Swift.php
View File

@ -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) {