summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-07-15 11:11:28 +0200
committerMorris Jobke <hey@morrisjobke.de>2015-07-15 11:11:28 +0200
commit90104fc5d813203ab048cfb4722efc60bd29e359 (patch)
tree829538c2e858155fbb3fcfbb5a84abe7a5277bcd
parent06d7480fa28c3eb6e79929a3719c65faa9b88176 (diff)
parent48b2a4e0343892f52ba708213fe48a1468581d36 (diff)
downloadnextcloud-server-90104fc5d813203ab048cfb4722efc60bd29e359.tar.gz
nextcloud-server-90104fc5d813203ab048cfb4722efc60bd29e359.zip
Merge pull request #17643 from owncloud/stable8.1-s2s-hasupdated-catch405
[stable8.1] Throw StorageNotAvailable if propfind on root failed
-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);