moparisthebest
/
davmail
mirror of https://github.com/moparisthebest/davmail
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove depth depth for iCal 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@246 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2008-12-23 18:06:20 +00:00
parent 738ff861ea
commit 6ca58fdbcc
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/java/davmail/caldav/CaldavConnection.java
View File

@ -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);
}