summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-07-14 08:56:53 +0200
committerMorris Jobke <hey@morrisjobke.de>2015-07-14 08:56:53 +0200
commitc601fb8181f8f0e71824a789f3d624d094b6552a (patch)
treed26c5ba3a1d2228c3861cf9b5b9c1e7a5e5a7b65 /lib
parent2d5ddb02fa6fd73ba4ef76e1f73b4ed7625e8c50 (diff)
parentf62d94c4ff353218c5a012066216080507821b48 (diff)
downloadnextcloud-server-c601fb8181f8f0e71824a789f3d624d094b6552a.tar.gz
nextcloud-server-c601fb8181f8f0e71824a789f3d624d094b6552a.zip
Merge pull request #17620 from owncloud/s2s-hasupdated-catch405
Throw StorageNotAvailable if propfind on root failed
Diffstat (limited to 'lib')
-rw-r--r--lib/private/files/storage/dav.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php
index d67e6b9f97e..e02f971b38b 100644
--- a/lib/private/files/storage/dav.php
+++ b/lib/private/files/storage/dav.php
@@ -760,7 +760,11 @@ class DAV extends Common {
return $remoteMtime > $time;
}
} catch (ClientHttpException $e) {
- if ($e->getHttpStatus() === 404) {
+ if ($e->getHttpStatus() === 404 || $e->getHttpStatus() === 405) {
+ if ($path === '') {
+ // if root is gone it means the storage is not available
+ throw new StorageNotAvailableException(get_class($e).': '.$e->getMessage());
+ }
return false;
}
$this->convertException($e);