Skip to content

Commit b3de86d

Browse files
committed
Remove locks plugin.
Reasoning: - a WebDAV server is not required to implement locking support - WebDAV Locking is know to break the sync algorithm - the current lock implementation is known to be broken (locks are not moved if a file is moved, locks on shared files don't work)
1 parent 432d7be commit b3de86d

File tree

3 files changed

+0
-175
lines changed

3 files changed

+0
-175
lines changed

apps/files/appinfo/remote.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
*/
2929
// Backends
3030
$authBackend = new \OC\Connector\Sabre\Auth();
31-
$lockBackend = new \OC\Connector\Sabre\Locks();
3231

3332
// Fire up server
3433
$objectTree = new \OC\Connector\Sabre\ObjectTree();
@@ -40,7 +39,6 @@
4039
// Load plugins
4140
$defaults = new OC_Defaults();
4241
$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend, $defaults->getName()));
43-
$server->addPlugin(new \Sabre\DAV\Locks\Plugin($lockBackend));
4442
// FIXME: The following line is a workaround for legacy components relying on being able to send a GET to /
4543
$server->addPlugin(new \OC\Connector\Sabre\DummyGetResponsePlugin());
4644
$server->addPlugin(new \OC\Connector\Sabre\FilesPlugin($objectTree));

apps/files_sharing/publicwebdav.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434

3535
// Backends
3636
$authBackend = new OCA\Files_Sharing\Connector\PublicAuth(\OC::$server->getConfig());
37-
$lockBackend = new \OC\Connector\Sabre\Locks();
3837

3938
// Fire up server
4039
$objectTree = new \OC\Connector\Sabre\ObjectTree();
@@ -46,7 +45,6 @@
4645
// Load plugins
4746
$defaults = new OC_Defaults();
4847
$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend, $defaults->getName()));
49-
$server->addPlugin(new \Sabre\DAV\Locks\Plugin($lockBackend));
5048
$server->addPlugin(new \Sabre\DAV\Browser\Plugin(false)); // Show something in the Browser, but no upload
5149
$server->addPlugin(new \OC\Connector\Sabre\FilesPlugin($objectTree));
5250
$server->addPlugin(new \OC\Connector\Sabre\MaintenancePlugin());

lib/private/connector/sabre/locks.php

Lines changed: 0 additions & 171 deletions
This file was deleted.

0 commit comments

Comments
 (0)