You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2014/05/15 09:55:04 UTC
svn commit: r1594807 - in
/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main:
java-deprecated/org/apache/http/impl/nio/client/DefaultHttpAsyncClient.java
java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java
Author: olegk
Date: Thu May 15 07:55:04 2014
New Revision: 1594807
URL: http://svn.apache.org/r1594807
Log:
HTTPCLIENT-1508: use actual JRE version when generating default User-Agent header
Modified:
httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultHttpAsyncClient.java
httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultHttpAsyncClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultHttpAsyncClient.java?rev=1594807&r1=1594806&r2=1594807&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultHttpAsyncClient.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultHttpAsyncClient.java Thu May 15 07:55:04 2014
@@ -47,6 +47,7 @@ import org.apache.http.protocol.RequestC
import org.apache.http.protocol.RequestExpectContinue;
import org.apache.http.protocol.RequestTargetHost;
import org.apache.http.protocol.RequestUserAgent;
+import org.apache.http.util.VersionInfo;
@Deprecated
public class DefaultHttpAsyncClient extends AbstractHttpAsyncClient {
@@ -75,7 +76,9 @@ public class DefaultHttpAsyncClient exte
HttpProtocolParams.setContentCharset(params, HTTP.DEF_CONTENT_CHARSET.name());
HttpConnectionParams.setTcpNoDelay(params, true);
HttpConnectionParams.setSocketBufferSize(params, 8192);
- HttpProtocolParams.setUserAgent(params, HttpAsyncClientBuilder.DEFAULT_USER_AGENT);
+ HttpProtocolParams.setUserAgent(params, VersionInfo.getUserAgent(
+ "Apache-HttpAsyncClient",
+ "org.apache.http.nio.client", DefaultHttpAsyncClient.class));
}
@Override
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java?rev=1594807&r1=1594806&r2=1594807&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java Thu May 15 07:55:04 2014
@@ -143,14 +143,6 @@ import org.apache.http.util.VersionInfo;
@NotThreadSafe
public class HttpAsyncClientBuilder {
- final static String DEFAULT_USER_AGENT;
- static {
- final VersionInfo vi = VersionInfo.loadVersionInfo("org.apache.http.nio.client",
- HttpAsyncClientBuilder.class.getClassLoader());
- final String release = vi != null ? vi.getRelease() : VersionInfo.UNAVAILABLE;
- DEFAULT_USER_AGENT = "Apache-HttpAsyncClient/" + release + " (java 1.5)";
- }
-
private NHttpClientConnectionManager connManager;
private boolean connManagerShared;
private SchemePortResolver schemePortResolver;
@@ -708,7 +700,9 @@ public class HttpAsyncClientBuilder {
userAgent = System.getProperty("http.agent");
}
if (userAgent == null) {
- userAgent = DEFAULT_USER_AGENT;
+ userAgent = VersionInfo.getUserAgent(
+ "Apache-HttpAsyncClient",
+ "org.apache.http.nio.client", getClass());
}
}