diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-10-01 12:10:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-01 12:10:59 +0200 |
| commit | 20ffc551d81ac9f40788dc84856126238cc30d0a (patch) | |
| tree | dd7da9d1a820dda238514d999655361c7b643f85 /apps/files_external | |
| parent | 95ea467c88c13a21981829add793b9ef6ff668c7 (diff) | |
| parent | 70ab6b93d8eb67dd14996cc7d7c75e8d8de3bbd0 (diff) | |
| download | nextcloud-server-20ffc551d81ac9f40788dc84856126238cc30d0a.tar.gz nextcloud-server-20ffc551d81ac9f40788dc84856126238cc30d0a.zip | |
Merge pull request #17298 from nextcloud/backport/17258/stable17
[stable17] add (hidden) option to configure smb timeout
Diffstat (limited to 'apps/files_external')
| -rw-r--r-- | apps/files_external/lib/Lib/Backend/SMB.php | 2 | ||||
| -rw-r--r-- | apps/files_external/lib/Lib/Storage/SMB.php | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/apps/files_external/lib/Lib/Backend/SMB.php b/apps/files_external/lib/Lib/Backend/SMB.php index 0543247051f..a1fcd7fe305 100644 --- a/apps/files_external/lib/Lib/Backend/SMB.php +++ b/apps/files_external/lib/Lib/Backend/SMB.php @@ -53,6 +53,8 @@ class SMB extends Backend { (new DefinitionParameter('show_hidden', $l->t('Show hidden files'))) ->setType(DefinitionParameter::VALUE_BOOLEAN) ->setFlag(DefinitionParameter::FLAG_OPTIONAL), + (new DefinitionParameter('timeout', $l->t('Timeout'))) + ->setType(DefinitionParameter::VALUE_HIDDEN) ]) ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD) ->addAuthScheme(AuthMechanism::SCHEME_SMB) diff --git a/apps/files_external/lib/Lib/Storage/SMB.php b/apps/files_external/lib/Lib/Storage/SMB.php index 85b4e620755..cd6ef5c2139 100644 --- a/apps/files_external/lib/Lib/Storage/SMB.php +++ b/apps/files_external/lib/Lib/Storage/SMB.php @@ -44,6 +44,7 @@ use Icewind\SMB\Exception\NotFoundException; use Icewind\SMB\Exception\TimedOutException; use Icewind\SMB\IFileInfo; use Icewind\SMB\Native\NativeServer; +use Icewind\SMB\Options; use Icewind\SMB\ServerFactory; use Icewind\SMB\System; use Icewind\Streams\CallbackWrapper; @@ -106,7 +107,14 @@ class SMB extends Common implements INotifyStorage { $this->logger = \OC::$server->getLogger(); } - $serverFactory = new ServerFactory(); + $options = new Options(); + if (isset($params['timeout'])) { + $timeout = (int)$params['timeout']; + if ($timeout > 0) { + $options->setTimeout($timeout); + } + } + $serverFactory = new ServerFactory($options); $this->server = $serverFactory->createServer($params['host'], $auth); $this->share = $this->server->getShare(trim($params['share'], '/')); |