EWS: revert chunked inputstream inside gzip and create new setting davmail.acceptEncodingGzip
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1936 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
parent
9ae80ce478
commit
4a116b8fb9
|
@ -19,6 +19,7 @@
|
||||||
package davmail.exchange.ews;
|
package davmail.exchange.ews;
|
||||||
|
|
||||||
import davmail.BundleMessage;
|
import davmail.BundleMessage;
|
||||||
|
import davmail.Settings;
|
||||||
import davmail.exchange.XMLStreamUtil;
|
import davmail.exchange.XMLStreamUtil;
|
||||||
import davmail.http.DavGatewayHttpClientFacade;
|
import davmail.http.DavGatewayHttpClientFacade;
|
||||||
import davmail.ui.tray.DavGatewayTray;
|
import davmail.ui.tray.DavGatewayTray;
|
||||||
|
@ -106,7 +107,9 @@ public abstract class EWSMethod extends PostMethod {
|
||||||
this.itemType = itemType;
|
this.itemType = itemType;
|
||||||
this.methodName = methodName;
|
this.methodName = methodName;
|
||||||
this.responseCollectionName = responseCollectionName;
|
this.responseCollectionName = responseCollectionName;
|
||||||
|
if (Settings.getBooleanProperty("davmail.acceptEncodingGzip", true)) {
|
||||||
setRequestHeader("Accept-Encoding", "gzip");
|
setRequestHeader("Accept-Encoding", "gzip");
|
||||||
|
}
|
||||||
setRequestEntity(new RequestEntity() {
|
setRequestEntity(new RequestEntity() {
|
||||||
byte[] content;
|
byte[] content;
|
||||||
|
|
||||||
|
@ -1018,7 +1021,7 @@ public abstract class EWSMethod extends PostMethod {
|
||||||
if (contentTypeHeader != null && "text/xml; charset=utf-8".equals(contentTypeHeader.getValue())) {
|
if (contentTypeHeader != null && "text/xml; charset=utf-8".equals(contentTypeHeader.getValue())) {
|
||||||
try {
|
try {
|
||||||
if (DavGatewayHttpClientFacade.isGzipEncoded(this)) {
|
if (DavGatewayHttpClientFacade.isGzipEncoded(this)) {
|
||||||
processResponseStream(new ChunkedInputStream(new GZIPInputStream(getResponseBodyAsStream())));
|
processResponseStream(new GZIPInputStream(getResponseBodyAsStream()));
|
||||||
} else {
|
} else {
|
||||||
processResponseStream(getResponseBodyAsStream());
|
processResponseStream(getResponseBodyAsStream());
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue