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

HTTPCLIENT-1508: use actual JRE version when generating default User-Agent header 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1594805 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2014-05-15 07:52:12 +00:00
parent 0a93660d96
commit 1ba8a897f3
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultHttpClient.java
View File

@ -47,6 +47,7 @@ import org.apache.http.protocol.RequestContent;
import org.apache.http.protocol.RequestExpectContinue; import org.apache.http.protocol.RequestExpectContinue;
import org.apache.http.protocol.RequestTargetHost; import org.apache.http.protocol.RequestTargetHost;
import org.apache.http.protocol.RequestUserAgent; import org.apache.http.protocol.RequestUserAgent;
import org.apache.http.util.VersionInfo;
/** /**
* Default implementation of {@link org.apache.http.client.HttpClient} pre-configured * Default implementation of {@link org.apache.http.client.HttpClient} pre-configured
@ -180,7 +181,8 @@ public class DefaultHttpClient extends AbstractHttpClient {
HttpProtocolParams.setContentCharset(params, HTTP.DEF_CONTENT_CHARSET.name()); HttpProtocolParams.setContentCharset(params, HTTP.DEF_CONTENT_CHARSET.name());
HttpConnectionParams.setTcpNoDelay(params, true); HttpConnectionParams.setTcpNoDelay(params, true);
HttpConnectionParams.setSocketBufferSize(params, 8192); HttpConnectionParams.setSocketBufferSize(params, 8192);
HttpProtocolParams.setUserAgent(params, HttpClientBuilder.DEFAULT_USER_AGENT); HttpProtocolParams.setUserAgent(params, VersionInfo.getUserAgent("Apache-HttpClient",
"org.apache.http.client", DefaultHttpClient.class));
} }
/** /**

14
httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
View File

@ -35,8 +35,8 @@ import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeUnit;
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.SSLSocketFactory;
@ -209,15 +209,6 @@ public class HttpClientBuilder {
private List<Closeable> closeables; private List<Closeable> closeables;
static final String DEFAULT_USER_AGENT;
static {
final VersionInfo vi = VersionInfo.loadVersionInfo
("org.apache.http.client", HttpClientBuilder.class.getClassLoader());
final String release = (vi != null) ?
vi.getRelease() : VersionInfo.UNAVAILABLE;
DEFAULT_USER_AGENT = "Apache-HttpClient/" + release + " (java 1.5)";
}
public static HttpClientBuilder create() { public static HttpClientBuilder create() {
return new HttpClientBuilder(); return new HttpClientBuilder();
} }
@ -864,7 +855,8 @@ public class HttpClientBuilder {
userAgentCopy = System.getProperty("http.agent"); userAgentCopy = System.getProperty("http.agent");
} }
if (userAgentCopy == null) { if (userAgentCopy == null) {
userAgentCopy = DEFAULT_USER_AGENT; userAgentCopy = VersionInfo.getUserAgent("Apache-HttpClient",
"org.apache.http.client", getClass());
} }
} }