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

HTTPCLIENT-1402: Cache default User-Agent value 

Contributed by yuexiaojun <junedo at qq.com>

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1525568 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2013-09-23 12:27:30 +00:00
parent 613ef11aaf
commit eeee0720b5
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RELEASE_NOTES.txt
View File

@ -1,6 +1,9 @@
Changes since 4.3 Changes since 4.3
------------------- -------------------
* [HTTPCLIENT-1402] Cache default User-Agent value.
Contributed by yuexiaojun <junedo at qq.com>
* [HTTPCLIENT-1398] Fixed invalid OSGi metadata caused by corrupted Maven bundle plugin metadata. * [HTTPCLIENT-1398] Fixed invalid OSGi metadata caused by corrupted Maven bundle plugin metadata.
Contributed by Oleg Kalnichevski <olegk at apache.org> Contributed by Oleg Kalnichevski <olegk at apache.org>

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

@ -47,7 +47,6 @@ 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
@ -181,14 +180,7 @@ 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);
// determine the release version from packaged version info
final VersionInfo vi = VersionInfo.loadVersionInfo
("org.apache.http.client", DefaultHttpClient.class.getClassLoader());
final String release = (vi != null) ?
vi.getRelease() : VersionInfo.UNAVAILABLE;
HttpProtocolParams.setUserAgent(params,
"Apache-HttpClient/" + release + " (java 1.5)");
} }
/** /**

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

@ -198,6 +198,15 @@ 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();
} }
@ -788,10 +797,7 @@ public class HttpClientBuilder {
userAgent = System.getProperty("http.agent"); userAgent = System.getProperty("http.agent");
} }
if (userAgent == null) { if (userAgent == null) {
final VersionInfo vi = VersionInfo.loadVersionInfo("org.apache.http.client", userAgent = DEFAULT_USER_AGENT;
HttpClientBuilder.class.getClassLoader());
final String release = vi != null ? vi.getRelease() : VersionInfo.UNAVAILABLE;
userAgent = "Apache-HttpClient/" + release + " (java 1.5)";
} }
} }