Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-06-06 12:34:18 +0300
committerVincent Petry <pvince81@owncloud.com>2016-06-06 12:34:18 +0300
commit6e7eb87c809b26614f075b7a9f5e1304e677b9b4 (patch)
treec7153e188f78f9a637bc4f3418fcc3da0ea3bc4f /apps
parent93699d4224192717a101311e3b7406ee2c201b74 (diff)
parentc433218aa1fb428ae88f49a3b291cd294061c5e1 (diff)
Merge pull request #24951 from owncloud/backport-24949-internal-server-error-in-sync-client-on-forbidden-directurl
[9.0] Catch the ForbiddenException to make sure it gets handled
Diffstat (limited to 'apps')
-rw-r--r--apps/dav/lib/connector/sabre/filesplugin.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/dav/lib/connector/sabre/filesplugin.php b/apps/dav/lib/connector/sabre/filesplugin.php
index e973b4e8682..bf9bee02578 100644
--- a/apps/dav/lib/connector/sabre/filesplugin.php
+++ b/apps/dav/lib/connector/sabre/filesplugin.php
@@ -27,6 +27,7 @@
namespace OCA\DAV\Connector\Sabre;
+use OCP\Files\ForbiddenException;
use Sabre\DAV\Exception\NotFound;
use Sabre\DAV\IFile;
use \Sabre\DAV\PropFind;
@@ -257,6 +258,8 @@ class FilesPlugin extends \Sabre\DAV\ServerPlugin {
}
} catch (StorageNotAvailableException $e) {
return false;
+ } catch (ForbiddenException $e) {
+ return false;
}
return false;
});