Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable9] apply retry wrapper to make sure that we always read/write a complete block #23442

Merged
merged 1 commit into from
Mar 22, 2016
Merged

[stable9] apply retry wrapper to make sure that we always read/write a complete block #23442

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion apps/files_external/lib/ftp.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@

namespace OC\Files\Storage;

use Icewind\Streams\RetryWrapper;

class FTP extends \OC\Files\Storage\StreamWrapper{
private $password;
private $user;
Expand Down Expand Up @@ -105,7 +107,8 @@ public function fopen($path,$mode) {
case 'ab':
//these are supported by the wrapper
$context = stream_context_create(array('ftp' => array('overwrite' => true)));
return fopen($this->constructUrl($path), $mode, false, $context);
$handle = fopen($this->constructUrl($path), $mode, false, $context);
return RetryWrapper::wrap($handle);
case 'r+':
case 'w+':
case 'wb+':
Expand Down