diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-03-08 09:27:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-08 09:27:12 +0100 |
| commit | 74ac5dffbd07f9a7ac9a248eeafaa0f2852b5f79 (patch) | |
| tree | 53731644775f8e87a2cbd5eff6a0aad35db29578 /apps | |
| parent | abecae2388fdb470e201cf74dccec416c57d512f (diff) | |
| parent | d228acabf60d9bcbe043e4022f74c2b553e156a9 (diff) | |
| download | nextcloud-server-74ac5dffbd07f9a7ac9a248eeafaa0f2852b5f79.tar.gz nextcloud-server-74ac5dffbd07f9a7ac9a248eeafaa0f2852b5f79.zip | |
Merge pull request #3757 from nextcloud/issue-2887-no-subsystem-for-locking
Add new user agent of windows 10 dav backend
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php | 1 | ||||
| -rw-r--r-- | apps/dav/lib/Server.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php b/apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php index c330e5d203a..eb490851fcb 100644 --- a/apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php +++ b/apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php @@ -136,6 +136,7 @@ class FakeLockerPlugin extends ServerPlugin { new LockDiscovery([$lockInfo]) ]); + $response->setStatus(200); $response->setBody($body); return false; diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php index 79c4301a8d8..5359bfc6991 100644 --- a/apps/dav/lib/Server.php +++ b/apps/dav/lib/Server.php @@ -155,6 +155,7 @@ class Server { if($request->isUserAgent([ '/WebDAVFS/', '/Microsoft Office OneNote 2013/', + '/^Microsoft-WebDAV/',// Microsoft-WebDAV-MiniRedir/6.1.7601 ])) { $this->server->addPlugin(new FakeLockerPlugin()); } |