summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2019-02-15 23:06:21 +0100
committerBackportbot <backportbot-noreply@rullzer.com>2019-02-19 07:05:49 +0000
commit39cfa50539e27384624e099ea6b909222a59a087 (patch)
tree6a3faf7595ec495c3b0165525079ee72f8f67dd6
parent4a0feef83d4d597a7ed6aa08c3902063c03e571a (diff)
downloadnextcloud-server-39cfa50539e27384624e099ea6b909222a59a087.tar.gz
nextcloud-server-39cfa50539e27384624e099ea6b909222a59a087.zip
Catch Request exception in testRemoteUrl
Else the background job fails hard if the remote has for example an invalid certificate. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
-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 7411d3c51b6..58da8456394 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;
@@ -280,6 +281,8 @@ class Storage extends DAV implements ISharedStorage, IDisableEncryptionStorage {
$returnValue = false;
} catch (ClientException $e) {
$returnValue = false;
+ } catch (RequestException $e) {
+ $returnValue = false;
}
$cache->set($url, $returnValue, 60*60*24);