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

More case insensitive tests on mail headers 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@42 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2007-03-25 17:24:46 +00:00
parent 7ed6ac77ec
commit 994a4ebbbd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/java/davmail/exchange/ExchangeSession.java
View File

@ -785,7 +785,7 @@ public class ExchangeSession {
public void writeMimeMessage(BufferedReader reader, OutputStream os, MimeHeader mimeHeader) throws IOException { public void writeMimeMessage(BufferedReader reader, OutputStream os, MimeHeader mimeHeader) throws IOException {
String line; String line;
// with alternative, there are two body forms (plain+html) // with alternative, there are two body forms (plain+html)
if ("multipart/alternative".equals(mimeHeader.contentType)) { if ("multipart/alternative".equalsIgnoreCase(mimeHeader.contentType)) {
attachmentIndex--; attachmentIndex--;
} }
@ -856,7 +856,7 @@ public class ExchangeSession {
} }
String decodedPath = URIUtil.decode(attachment.href); String decodedPath = URIUtil.decode(attachment.href);
if ("message/rfc822".equals(mimeHeader.contentType)) { if ("message/rfc822".equalsIgnoreCase(mimeHeader.contentType)) {
String messageAttachmentPath = null; String messageAttachmentPath = null;
// Get real attachment path from owa page content // Get real attachment path from owa page content
@ -911,7 +911,7 @@ public class ExchangeSession {
throw new IOException(e + " " + e.getMessage()); throw new IOException(e + " " + e.getMessage());
} }
String currentBody; String currentBody;
if ("text/html".equals(mimeHeader.contentType)) { if ("text/html".equalsIgnoreCase(mimeHeader.contentType)) {
currentBody = htmlBody; currentBody = htmlBody;
// patch charset if null and html body encoded // patch charset if null and html body encoded
if (mimeHeader.charset == null) { if (mimeHeader.charset == null) {
@ -1043,7 +1043,7 @@ public class ExchangeSession {
throw new RuntimeException("Exception retrieving " + attachmentUrl + " : " + e + " " + e.getCause()); throw new RuntimeException("Exception retrieving " + attachmentUrl + " : " + e + " " + e.getCause());
} }
// fix content type for known extension // fix content type for known extension
if ("application/octet-stream".equals(result) && attachmentUrl.endsWith(".pdf")) { if ("application/octet-stream".equalsIgnoreCase(result) && attachmentUrl.endsWith(".pdf")) {
result = "application/pdf"; result = "application/pdf";
} }
return result; return result;
@ -1089,7 +1089,7 @@ public class ExchangeSession {
// do not load attachments twice // do not load attachments twice
if (attachmentsMap == null) { if (attachmentsMap == null) {
GetMethod getMethod = new GetMethod(URIUtil.encodePathQuery(messageUrl + "?Cmd=Open")); GetMethod getMethod = new GetMethod(URIUtil.encodePathQuery(messageUrl + "?Cmd=Open&unfiltered=1"));
wdr.retrieveSessionInstance().executeMethod(getMethod); wdr.retrieveSessionInstance().executeMethod(getMethod);
if (getMethod.getStatusCode() != 200) { if (getMethod.getStatusCode() != 200) {
throw new IOException("Unable to get attachments: " + getMethod.getStatusCode() throw new IOException("Unable to get attachments: " + getMethod.getStatusCode()
@ -1353,7 +1353,7 @@ public class ExchangeSession {
writeLine(os, ""); writeLine(os, "");
// strip header content for attached messages // strip header content for attached messages
if ("message/rfc822".equals(contentType)) { if ("message/rfc822".equalsIgnoreCase(contentType)) {
MimeHeader internalMimeHeader = new MimeHeader(); MimeHeader internalMimeHeader = new MimeHeader();
internalMimeHeader.processHeaders(reader, null); internalMimeHeader.processHeaders(reader, null);
if (internalMimeHeader.boundary != null) { if (internalMimeHeader.boundary != null) {