summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2019-02-19 09:52:14 +0100
committerGitHub <noreply@github.com>2019-02-19 09:52:14 +0100
commit543ab23e505587c61d1d8948c1f89c45b22a3706 (patch)
tree2b3674e451f889116436e31f167ea95e1dad06cc
parent53b295456d95a1aa59634c63094e30748cdaa2d0 (diff)
parentcf6cbf48707f2c245e19e17f0e5ab2792ca1d173 (diff)
downloadnextcloud-server-543ab23e505587c61d1d8948c1f89c45b22a3706.tar.gz
nextcloud-server-543ab23e505587c61d1d8948c1f89c45b22a3706.zip
Merge pull request #14278 from nextcloud/backport/14234/stable14
[stable14] Catch Request exception in testRemoteUrl
-rw-r--r--apps/files_sharing/lib/External/Storage.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/files_sharing/lib/External/Storage.php b/apps/files_sharing/lib/External/Storage.php
index dadb1def702..a2ff9ebda6e 100644
--- a/apps/files_sharing/lib/External/Storage.php
+++ b/apps/files_sharing/lib/External/Storage.php
@@ -32,6 +32,7 @@ namespace OCA\Files_Sharing\External;
use GuzzleHttp\Exception\ClientException;
use GuzzleHttp\Exception\ConnectException;
+use GuzzleHttp\Exception\RequestException;
use OC\Files\Storage\DAV;
use OC\ForbiddenException;
use OCA\Files_Sharing\ISharedStorage;
@@ -279,6 +280,8 @@ class Storage extends DAV implements ISharedStorage {
$returnValue = false;
} catch (ClientException $e) {
$returnValue = false;
+ } catch (RequestException $e) {
+ $returnValue = false;
}
$cache->set($url, $returnValue, 60*60*24);