Merge pull request #348 from nextcloud/capabilities_timeout

Have the capabilities properly timeout
nextcloud · Jan 9, 2019 · a48b0e8 · a48b0e8
2 parents 53b6fa1 + 97df951
commit a48b0e8
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/Capabilities.php b/lib/Capabilities.php
@@ -104,7 +104,12 @@ private function getCollaboraCapabilities() {
 
 		$client = $this->clientService->newClient();
 		try {
-			$response = $client->get($capabilitiesEndpoint);
+			$response = $client->get(
+				$capabilitiesEndpoint,
+				[
+					'timeout' => 5,
+				]
+			);
 		} catch (\Exception $e) {
 			return [];
 		}