diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2016-06-15 16:30:24 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2016-06-22 10:29:40 +0200 |
| commit | 3e763ac81e895d2b4af18af2bcd7a31e25da4cf6 (patch) | |
| tree | 12539e73e95bb8938ba63beedd078933a132592e /apps/federatedfilesharing | |
| parent | b85bcccc09746137dd6fed78629b5bce45cebe01 (diff) | |
| download | nextcloud-server-3e763ac81e895d2b4af18af2bcd7a31e25da4cf6.tar.gz nextcloud-server-3e763ac81e895d2b4af18af2bcd7a31e25da4cf6.zip | |
Add timeouts to make the UI usable again when a remote share is unreachable
Diffstat (limited to 'apps/federatedfilesharing')
| -rw-r--r-- | apps/federatedfilesharing/lib/DiscoveryManager.php | 5 | ||||
| -rw-r--r-- | apps/federatedfilesharing/lib/Notifications.php | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/apps/federatedfilesharing/lib/DiscoveryManager.php b/apps/federatedfilesharing/lib/DiscoveryManager.php index 2a4bb4b7f77..bf8dfeb31dc 100644 --- a/apps/federatedfilesharing/lib/DiscoveryManager.php +++ b/apps/federatedfilesharing/lib/DiscoveryManager.php @@ -84,7 +84,10 @@ class DiscoveryManager { // Read the data from the response body try { - $response = $this->client->get($remote . '/ocs-provider/'); + $response = $this->client->get($remote . '/ocs-provider/', [ + 'timeout' => 3, + 'connect_timeout' => 3, + ]); if($response->getStatusCode() === 200) { $decodedService = json_decode($response->getBody(), true); if(is_array($decodedService)) { diff --git a/apps/federatedfilesharing/lib/Notifications.php b/apps/federatedfilesharing/lib/Notifications.php index 18212b82c3e..575521d564d 100644 --- a/apps/federatedfilesharing/lib/Notifications.php +++ b/apps/federatedfilesharing/lib/Notifications.php @@ -287,7 +287,9 @@ class Notifications { $endpoint = $this->discoveryManager->getShareEndpoint($protocol . $remoteDomain); try { $response = $client->post($protocol . $remoteDomain . $endpoint . $urlSuffix . '?format=' . self::RESPONSE_FORMAT, [ - 'body' => $fields + 'body' => $fields, + 'timeout' => 3, + 'connect_timeout' => 3, ]); $result['result'] = $response->getBody(); $result['success'] = true; |