mirror of
https://github.com/moparisthebest/davmail
synced 2024-12-13 11:12:22 -05:00
Dav: new patch to reset session timeout with a GET method on /owa/
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1668 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
parent
4121061c7a
commit
11676ee5fd
@ -107,9 +107,11 @@ public class DavExchangeSession extends ExchangeSession {
|
||||
@Override
|
||||
public boolean isExpired() throws NoRouteToHostException, UnknownHostException {
|
||||
// experimental: try to reset session timeout
|
||||
if ("Exchange2007".equals(serverVersion)) {
|
||||
GetMethod getMethod = null;
|
||||
try {
|
||||
getMethod = new GetMethod(URIUtil.encodePath(getFolderPath("")));
|
||||
getMethod = new GetMethod("/owa/");
|
||||
getMethod.setFollowRedirects(false);
|
||||
httpClient.executeMethod(getMethod);
|
||||
} catch (IOException e) {
|
||||
LOGGER.warn(e.getMessage());
|
||||
@ -118,6 +120,7 @@ public class DavExchangeSession extends ExchangeSession {
|
||||
getMethod.releaseConnection();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return super.isExpired();
|
||||
}
|
||||
@ -530,7 +533,7 @@ public class DavExchangeSession extends ExchangeSession {
|
||||
if (mailPath == null || email == null) {
|
||||
throw new DavMailAuthenticationException("EXCEPTION_AUTHENTICATION_FAILED_PASSWORD_EXPIRED");
|
||||
}
|
||||
LOGGER.debug("Current user email is " + email + ", alias is " + alias + ", mailPath is " + mailPath + " on "+ serverVersion);
|
||||
LOGGER.debug("Current user email is " + email + ", alias is " + alias + ", mailPath is " + mailPath + " on " + serverVersion);
|
||||
rootPath = mailPath.substring(0, mailPath.lastIndexOf('/', mailPath.length() - 2) + 1);
|
||||
}
|
||||
|
||||
@ -2261,11 +2264,11 @@ public class DavExchangeSession extends ExchangeSession {
|
||||
String contentType = mimeMessage.getContentType();
|
||||
|
||||
if (contentType.startsWith("text/plain")) {
|
||||
propertyList.add(Field.createDavProperty("description", (String)mimeMessage.getContent()));
|
||||
propertyList.add(Field.createDavProperty("description", (String) mimeMessage.getContent()));
|
||||
} else if (contentType.startsWith("text/html")) {
|
||||
propertyList.add(Field.createDavProperty("htmldescription", (String)mimeMessage.getContent()));
|
||||
propertyList.add(Field.createDavProperty("htmldescription", (String) mimeMessage.getContent()));
|
||||
} else {
|
||||
LOGGER.warn("Unsupported content type: "+contentType+" message body will be empty");
|
||||
LOGGER.warn("Unsupported content type: " + contentType + " message body will be empty");
|
||||
}
|
||||
|
||||
propertyList.add(Field.createDavProperty("subject", mimeMessage.getHeader("subject", ",")));
|
||||
|
Loading…
Reference in New Issue
Block a user