Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HTTPCLIENT-1654: better backward compatibility 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/branches/4.5.x@1682713 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2015-05-31 10:46:03 +00:00
parent 2227d18696
commit ea21ed26a7
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
httpclient/src/main/java/org/apache/http/client/config/RequestConfig.java
View File

@ -58,14 +58,13 @@ public class RequestConfig implements Cloneable {
private final int connectionRequestTimeout;
private final int connectTimeout;
private final int socketTimeout;
private final boolean decompressionEnabled;
private final boolean contentCompressionEnabled;
/**
* Intended for CDI compatibility
*/
protected RequestConfig() {
this(false, null, null, false, null, false, false, false, 0, false, null, null, 0, 0, 0, false, false);
this(false, null, null, false, null, false, false, false, 0, false, null, null, 0, 0, 0, true);
}
RequestConfig(
@ -84,7 +83,6 @@ public class RequestConfig implements Cloneable {
final int connectionRequestTimeout,
final int connectTimeout,
final int socketTimeout,
final boolean decompressionEnabled,
final boolean contentCompressionEnabled) {
super();
this.expectContinueEnabled = expectContinueEnabled;
@ -102,7 +100,6 @@ public class RequestConfig implements Cloneable {
this.connectionRequestTimeout = connectionRequestTimeout;
this.connectTimeout = connectTimeout;
this.socketTimeout = socketTimeout;
this.decompressionEnabled = decompressionEnabled;
this.contentCompressionEnabled = contentCompressionEnabled;
}
@ -319,7 +316,7 @@ public class RequestConfig implements Cloneable {
*/
@Deprecated
public boolean isDecompressionEnabled() {
return decompressionEnabled;
return contentCompressionEnabled;
}
/**
@ -357,7 +354,6 @@ public class RequestConfig implements Cloneable {
builder.append(", connectionRequestTimeout=").append(connectionRequestTimeout);
builder.append(", connectTimeout=").append(connectTimeout);
builder.append(", socketTimeout=").append(socketTimeout);
builder.append(", decompressionEnabled=").append(decompressionEnabled);
builder.append(", contentCompressionEnabled=").append(contentCompressionEnabled);
builder.append("]");
return builder.toString();
@ -406,7 +402,6 @@ public class RequestConfig implements Cloneable {
private int connectionRequestTimeout;
private int connectTimeout;
private int socketTimeout;
private boolean decompressionEnabled;
private boolean contentCompressionEnabled;
Builder() {
@ -419,7 +414,6 @@ public class RequestConfig implements Cloneable {
this.connectionRequestTimeout = -1;
this.connectTimeout = -1;
this.socketTimeout = -1;
this.decompressionEnabled = true;
this.contentCompressionEnabled = true;
}
@ -509,7 +503,7 @@ public class RequestConfig implements Cloneable {
*/
@Deprecated
public Builder setDecompressionEnabled(final boolean decompressionEnabled) {
this.decompressionEnabled = decompressionEnabled;
this.contentCompressionEnabled = decompressionEnabled;
return this;
}
@ -535,7 +529,6 @@ public class RequestConfig implements Cloneable {
connectionRequestTimeout,
connectTimeout,
socketTimeout,
decompressionEnabled,
contentCompressionEnabled);
}

2
httpclient/src/main/java/org/apache/http/client/protocol/ResponseContentEncoding.java
View File

@ -129,7 +129,7 @@ public class ResponseContentEncoding implements HttpResponseInterceptor {
final RequestConfig requestConfig = clientContext.getRequestConfig();
// entity can be null in case of 304 Not Modified, 204 No Content or similar
// check for zero length entity.
if (requestConfig.isDecompressionEnabled() && entity != null && entity.getContentLength() != 0) {
if (requestConfig.isContentCompressionEnabled() && entity != null && entity.getContentLength() != 0) {
final Header ceheader = entity.getContentEncoding();
if (ceheader != null) {
final HeaderElement[] codecs = ceheader.getElements();