diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-06-21 17:37:44 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2016-06-22 10:29:40 +0200 |
| commit | ec968a48e44159c1bb323d6ea3be3388277d7928 (patch) | |
| tree | 82e5b19284b6f0bef067e4f082f68ca0214d1079 /apps/files_sharing | |
| parent | 3e763ac81e895d2b4af18af2bcd7a31e25da4cf6 (diff) | |
| download | nextcloud-server-ec968a48e44159c1bb323d6ea3be3388277d7928.tar.gz nextcloud-server-ec968a48e44159c1bb323d6ea3be3388277d7928.zip | |
Increase fed share timeout from 3 to 10 + unit tests
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/ajax/external.php | 4 | ||||
| -rw-r--r-- | apps/files_sharing/lib/External/Storage.php | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/apps/files_sharing/ajax/external.php b/apps/files_sharing/ajax/external.php index 6a0a4dfc06b..4a7a6096c91 100644 --- a/apps/files_sharing/ajax/external.php +++ b/apps/files_sharing/ajax/external.php @@ -78,8 +78,8 @@ $externalManager = new \OCA\Files_Sharing\External\Manager( if (substr($remote, 0, 5) === 'https') { try { \OC::$server->getHTTPClientService()->newClient()->get($remote, [ - 'timeout' => 3, - 'connect_timeout' => 3, + 'timeout' => 10, + 'connect_timeout' => 10, ])->getBody(); } catch (\Exception $e) { \OCP\JSON::error(array('data' => array('message' => $l->t('Invalid or untrusted SSL certificate')))); diff --git a/apps/files_sharing/lib/External/Storage.php b/apps/files_sharing/lib/External/Storage.php index 7302de5f934..29b9c7b563c 100644 --- a/apps/files_sharing/lib/External/Storage.php +++ b/apps/files_sharing/lib/External/Storage.php @@ -255,8 +255,8 @@ class Storage extends DAV implements ISharedStorage { $client = $this->httpClient->newClient(); try { $result = $client->get($url, [ - 'timeout' => 3, - 'connect_timeout' => 3, + 'timeout' => 10, + 'connect_timeout' => 10, ])->getBody(); $data = json_decode($result); $returnValue = (is_object($data) && !empty($data->version)); @@ -306,8 +306,8 @@ class Storage extends DAV implements ISharedStorage { try { $response = $client->post($url, [ 'body' => ['password' => $password], - 'timeout' => 3, - 'connect_timeout' => 3, + 'timeout' => 10, + 'connect_timeout' => 10, ]); } catch (\GuzzleHttp\Exception\RequestException $e) { if ($e->getCode() === 401 || $e->getCode() === 403) { |