summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-06-02 10:39:43 +0200
committerVincent Petry <pvince81@owncloud.com>2016-06-02 10:39:43 +0200
commitf584d5f03ef0176c50636be338733b68ffa43a26 (patch)
tree0a09541c9891a5b0d4c68a7871dc2225d338b238 /apps
parenta81c7dd3bbf6d7112892439b1cf2ac27deaf512f (diff)
parent942e946f066db0437d4c6a371f4c1e5e2f350207 (diff)
downloadnextcloud-server-f584d5f03ef0176c50636be338733b68ffa43a26.tar.gz
nextcloud-server-f584d5f03ef0176c50636be338733b68ffa43a26.zip
Merge pull request #24949 from owncloud/ee-1325-internal-server-error-in-sync-client-on-forbidden-directurl
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 a1fb1bf0aee..a4e13709559 100644
--- a/apps/dav/lib/Connector/Sabre/FilesPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
@@ -30,6 +30,7 @@ namespace OCA\DAV\Connector\Sabre;
use OC\Files\View;
use OCA\DAV\Upload\FutureFile;
+use OCP\Files\ForbiddenException;
use Sabre\DAV\Exception\Forbidden;
use Sabre\DAV\Exception\NotFound;
use Sabre\DAV\IFile;
@@ -311,6 +312,8 @@ class FilesPlugin extends ServerPlugin {
}
} catch (StorageNotAvailableException $e) {
return false;
+ } catch (ForbiddenException $e) {
+ return false;
}
return false;
});