From 6ca58fdbcc1d44c50cec2a5a05453f0af4407f29 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Tue, 23 Dec 2008 18:06:20 +0000
Subject: [PATCH] Remove depth depth for iCal

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@246 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/java/davmail/caldav/CaldavConnection.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/java/davmail/caldav/CaldavConnection.java b/src/java/davmail/caldav/CaldavConnection.java
index 9d08aa56..b31d4e98 100644
--- a/src/java/davmail/caldav/CaldavConnection.java
+++ b/src/java/davmail/caldav/CaldavConnection.java
@@ -160,7 +160,8 @@ public class CaldavConnection extends AbstractConnection {
         if ("OPTIONS".equals(command)) {
             sendOptions();
         } else if ("PROPFIND".equals(command)
-                && ("/user/".equals(path) || "/user".equals(path))) {
+                && ("/user/".equals(path) || "/user".equals(path))
+                && body != null) {
             CaldavRequest request = new CaldavRequest(body);
             StringBuilder buffer = new StringBuilder();
             buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
@@ -202,7 +203,7 @@ public class CaldavConnection extends AbstractConnection {
 
         } else if ("PROPFIND".equals(command)
                 && ("/calendar/".equals(path) || "/calendar".equals(path)) 
-                && depth == 0 && body != null) {
+                && body != null) {
             CaldavRequest request = new CaldavRequest(body);
 
             StringBuilder buffer = new StringBuilder();
@@ -238,7 +239,9 @@ public class CaldavConnection extends AbstractConnection {
             HashMap<String, String> responseHeaders = new HashMap<String, String>();
             sendHttpResponse(HttpStatus.SC_MULTI_STATUS, responseHeaders, "text/xml;charset=UTF-8", buffer.toString(), true);
 
-        } else if ("REPORT".equals(command) && "/calendar/".equals(path) && depth == 1 && body != null) {
+        } else if ("REPORT".equals(command)
+                && ("/calendar/".equals(path) || "/calendar".equals(path)) 
+                && depth == 1 && body != null) {
             CaldavRequest request = new CaldavRequest(body);
 
             List<ExchangeSession.Event> events;
@@ -359,7 +362,7 @@ public class CaldavConnection extends AbstractConnection {
             int status = session.deleteEvent(path.substring("/calendar/".length()));
             sendHttpResponse(status, true);
         } else {
-            DavGatewayTray.error("Unsupported command: " + command + " " + path + "\n" + body);
+            DavGatewayTray.error("Unsupported command: " + command + " " + path + " Depth: "+depth+"\n" + body);
             sendErr(HttpStatus.SC_BAD_REQUEST, "Unsupported command: " + command);
         }