diff options
author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-02-19 08:05:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-19 08:05:05 +0100 |
commit | 1846bc37d78f911d3d21ea4ccd1b9d9fedbc08f0 (patch) | |
tree | 685032f9350cfee85cafd6770c7b1f51a4ac5229 | |
parent | ad0b67cbce0abc148ba6dc3a6ddeeb51efa4e6bd (diff) | |
parent | 0e72d38747b12913c7524e07f8f9adc11f75f407 (diff) | |
download | nextcloud-server-1846bc37d78f911d3d21ea4ccd1b9d9fedbc08f0.tar.gz nextcloud-server-1846bc37d78f911d3d21ea4ccd1b9d9fedbc08f0.zip |
Merge pull request #14234 from nextcloud/fix/catch_requestexception
Catch Request exception in testRemoteUrl
-rw-r--r-- | apps/files_sharing/lib/External/Storage.php | 3 |
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); |