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

Caldav: chunked encoding on all caldav responses 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@457 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2009-03-19 08:19:47 +00:00
parent df9071c572
commit 263826ce9a
1 changed files with 32 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,9 +22,6 @@ import java.net.SocketException;
import java.net.SocketTimeoutException; import java.net.SocketTimeoutException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.nio.CharBuffer;
import java.nio.charset.Charset;
import java.nio.charset.CharsetEncoder;
/** /**
* Handle a caldav connection. * Handle a caldav connection.
@ -399,7 +396,7 @@ public class CaldavConnection extends AbstractConnection {
appendEventsResponses(response, request, "inbox", events); appendEventsResponses(response, request, "inbox", events);
} }
response.endMultistatus(); response.endMultistatus();
sendHttpResponse(HttpStatus.SC_MULTI_STATUS, null, response, true); response.close();
} }
public void sendOutbox(CaldavRequest request, String principal) throws IOException { public void sendOutbox(CaldavRequest request, String principal) throws IOException {
@ -407,7 +404,7 @@ public class CaldavConnection extends AbstractConnection {
response.startMultistatus(); response.startMultistatus();
appendOutbox(response, principal, request); appendOutbox(response, principal, request);
response.endMultistatus(); response.endMultistatus();
sendHttpResponse(HttpStatus.SC_MULTI_STATUS, null, response, true); response.close();
} }
public void sendCalendar(CaldavRequest request, int depth, String principal) throws IOException { public void sendCalendar(CaldavRequest request, int depth, String principal) throws IOException {
@ -421,7 +418,7 @@ public class CaldavConnection extends AbstractConnection {
appendEventsResponses(response, request, "calendar", events); appendEventsResponses(response, request, "calendar", events);
} }
response.endMultistatus(); response.endMultistatus();
sendHttpResponse(HttpStatus.SC_MULTI_STATUS, null, response, true); response.close();
} }
public void patchCalendar(CaldavRequest request, int depth, String principal) throws IOException { public void patchCalendar(CaldavRequest request, int depth, String principal) throws IOException {
@ -429,7 +426,7 @@ public class CaldavConnection extends AbstractConnection {
response.startMultistatus(); response.startMultistatus();
// just ignore calendar folder proppatch (color not supported in Exchange) // just ignore calendar folder proppatch (color not supported in Exchange)
response.endMultistatus(); response.endMultistatus();
sendHttpResponse(HttpStatus.SC_MULTI_STATUS, null, response, true); response.close();
} }
protected String getEventFileNameFromPath(String path) { protected String getEventFileNameFromPath(String path) {
@ -469,11 +466,7 @@ public class CaldavConnection extends AbstractConnection {
events = session.getAllEvents(); events = session.getAllEvents();
} }
HashMap<String, String> headers = new HashMap<String, String>(); CaldavResponse response = new CaldavResponse();
headers.put("Transfer-Encoding", "chunked");
sendHttpResponse(HttpStatus.SC_MULTI_STATUS, headers, false);
CaldavResponse response = new CaldavResponse(true);
response.startMultistatus(); response.startMultistatus();
appendEventsResponses(response, request, path, events); appendEventsResponses(response, request, path, events);
@ -508,7 +501,7 @@ public class CaldavConnection extends AbstractConnection {
} }
response.endResponse(); response.endResponse();
response.endMultistatus(); response.endMultistatus();
sendHttpResponse(HttpStatus.SC_MULTI_STATUS, null, response, true); response.close();
} }
public void sendRoot(CaldavRequest request) throws IOException { public void sendRoot(CaldavRequest request) throws IOException {
@ -526,7 +519,7 @@ public class CaldavConnection extends AbstractConnection {
response.endPropStatOK(); response.endPropStatOK();
response.endResponse(); response.endResponse();
response.endMultistatus(); response.endMultistatus();
sendHttpResponse(HttpStatus.SC_MULTI_STATUS, null, response, true); response.close();
} }
public void sendPrincipal(CaldavRequest request, String principal) throws IOException { public void sendPrincipal(CaldavRequest request, String principal) throws IOException {
@ -566,7 +559,7 @@ public class CaldavConnection extends AbstractConnection {
response.endPropStatOK(); response.endPropStatOK();
response.endResponse(); response.endResponse();
response.endMultistatus(); response.endMultistatus();
sendHttpResponse(HttpStatus.SC_MULTI_STATUS, null, response, true); response.close();
} }
public void sendFreeBusy(String body) throws IOException { public void sendFreeBusy(String body) throws IOException {
@ -634,7 +627,7 @@ public class CaldavConnection extends AbstractConnection {
} }
response.endScheduleResponse(); response.endScheduleResponse();
sendHttpResponse(HttpStatus.SC_OK, null, response, true); response.close();
} else { } else {
sendHttpResponse(HttpStatus.SC_NOT_FOUND, null, "text/plain", "Unknown recipient: " + valueMap.get("ATTENDEE"), true); sendHttpResponse(HttpStatus.SC_NOT_FOUND, null, "text/plain", "Unknown recipient: " + valueMap.get("ATTENDEE"), true);
} }
@ -685,8 +678,10 @@ public class CaldavConnection extends AbstractConnection {
sendHttpResponse(status, headers, null, (byte[]) null, keepAlive); sendHttpResponse(status, headers, null, (byte[]) null, keepAlive);
} }
public void sendHttpResponse(int status, Map<String, String> headers, CaldavResponse response, boolean keepAlive) throws IOException { public void sendChunkedHttpResponse() throws IOException {
sendHttpResponse(status, headers, "text/xml;charset=UTF-8", response.getBytes(), keepAlive); HashMap<String, String> headers = new HashMap<String, String>();
headers.put("Transfer-Encoding", "chunked");
sendHttpResponse(HttpStatus.SC_MULTI_STATUS, headers, "text/xml;charset=UTF-8", (byte[]) null, true);
} }
public void sendHttpResponse(int status, Map<String, String> headers, String contentType, String content, boolean keepAlive) throws IOException { public void sendHttpResponse(int status, Map<String, String> headers, String contentType, String content, boolean keepAlive) throws IOException {
@ -822,48 +817,28 @@ public class CaldavConnection extends AbstractConnection {
} }
protected class CaldavResponse { protected class CaldavResponse {
ByteArrayOutputStream outputStream;
Writer writer; Writer writer;
public CaldavResponse() throws IOException { public CaldavResponse() throws IOException {
outputStream = new ByteArrayOutputStream(); writer = new OutputStreamWriter(new BufferedOutputStream(new OutputStream() {
writer = new OutputStreamWriter(outputStream, "UTF-8"); @Override
writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); public void write(byte[] data, int offset, int length) throws IOException {
} sendClient(Integer.toHexString(length));
sendClient(data, offset, length);
sendClient("");
}
public CaldavResponse(boolean chunked) throws IOException { @Override
if (chunked) { public void write(int b) throws IOException {
writer = new OutputStreamWriter(new BufferedOutputStream(new OutputStream() { throw new UnsupportedOperationException();
public void write(byte[] data, int offset, int length) throws IOException { }
sendClient(Integer.toHexString(length)); @Override
sendClient(data, offset, length); public void close() throws IOException{
sendClient(""); sendClient("0");
} sendClient("");
public void write(int b) throws IOException { }
throw new UnsupportedOperationException(); }), "UTF-8");
} sendChunkedHttpResponse();
}), "UTF-8");
/*
writer = new BufferedWriter(new Writer() {
public void write(char[] cbuf, int off, int len) throws IOException {
byte[] data = new String(cbuf, off, len).getBytes("UTF-8");
sendClient(Integer.toHexString(data.length));
sendClient(data);
sendClient("");
}
public void flush() throws IOException {
// ignore
}
public void close() throws IOException {
sendClient("0");
}
});*/
} else {
outputStream = new ByteArrayOutputStream();
writer = new OutputStreamWriter(outputStream, "UTF-8");
}
writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
} }
@ -965,19 +940,9 @@ public class CaldavConnection extends AbstractConnection {
} }
public void close() throws IOException { public void close() throws IOException {
try { writer.close();
writer.close();
} finally {
if (outputStream != null) {
outputStream.close();
}
}
} }
public byte[] getBytes() throws IOException {
close();
return outputStream.toByteArray();
}
} }
} }