[Pkg-owncloud-commits] [php-sabredav] 20/80: Windows 10 support. Fixes #727

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabredav.

commit 1feeb1bb87c5176ab1c9886c0761c7ac2ef151c4
Author: Evert Pot <me at evertpot.com>
Date:   Tue Oct 27 00:16:33 2015 -0400

    Windows 10 support. Fixes #727
---
 CHANGELOG.md          | 1 +
 lib/CalDAV/Plugin.php | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3479f5e..a7ead8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ ChangeLog
 * #730: Switched all mysql tables to `utf8mb4` character set, allowing you to
   use emoji in some tables where you couldn't before.
 * #729: Not all calls to `Sabre\DAV\Tree::getChildren()` were properly cached.
+* #727: Added another workaround to make CalDAV work for Windows 10 clients.
 
 
 3.1.0-alpha2 (2015-09-05)
diff --git a/lib/CalDAV/Plugin.php b/lib/CalDAV/Plugin.php
index f809808..41e8973 100644
--- a/lib/CalDAV/Plugin.php
+++ b/lib/CalDAV/Plugin.php
@@ -588,10 +588,14 @@ class Plugin extends DAV\ServerPlugin {
 
         if ($node instanceof ICalendarObjectContainer && $depth === 0) {
 
-            if (strpos($this->server->httpRequest->getHeader('User-Agent'), 'MSFT-WP/') === 0) {
-                // Windows phone incorrectly supplied depth as 0, when it actually
+            if (strpos($this->server->httpRequest->getHeader('User-Agent'), 'MSFT-') === 0) {
+                // Microsoft clients incorrectly supplied depth as 0, when it actually
                 // should have set depth to 1. We're implementing a workaround here
                 // to deal with this.
+                //
+                // This targets at least the following clients:
+                //   Windows 10
+                //   Windows Phone 8, 10
                 $depth = 1;
             } else {
                 throw new BadRequest('A calendar-query REPORT on a calendar with a Depth: 0 is undefined. Set Depth to 1');

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git