Fix for https://issues.sonatype.org/browse/AHC-94

(" Custom user-agent is ignored ")

Author: jfarcand

src/main/java/com/ning/http/client/providers/apache/ApacheAsyncHttpProvider.java

@@ -39,6 +39,7 @@
 import com.ning.http.client.filter.IOExceptionFilter;
 import com.ning.http.client.filter.ResponseFilter;
 import com.ning.http.client.listener.TransferCompletionHandler;
+import com.ning.http.client.providers.netty.NettyAsyncHttpProvider;
 import com.ning.http.client.resumable.ResumableAsyncHandler;
 import com.ning.http.util.AsyncHttpProviderUtils;
 import com.ning.http.util.ProxyUtils;
@@ -369,10 +370,12 @@ private HttpMethodBase createMethod(HttpClient client, Request request) throws I
             }
         }
 
-        if (request.getHeaders().getFirstValue("User-Agent") == null && config.getUserAgent() != null) {
+        if (request.getHeaders().getFirstValue("User-Agent") != null) {
+            method.setRequestHeader("User-Agent", request.getHeaders().getFirstValue("User-Agent"));
+        } else if (config.getUserAgent() != null) {
             method.setRequestHeader("User-Agent", config.getUserAgent());
         } else {
-            method.setRequestHeader("User-Agent", AsyncHttpProviderUtils.constructUserAgent(ApacheAsyncHttpProvider.class));
+            method.setRequestHeader("User-Agent", AsyncHttpProviderUtils.constructUserAgent(NettyAsyncHttpProvider.class));
         }
 
         if (config.isCompressionEnabled()) {

src/main/java/com/ning/http/client/providers/jdk/JDKAsyncHttpProvider.java

@@ -35,6 +35,7 @@
 import com.ning.http.client.filter.IOExceptionFilter;
 import com.ning.http.client.filter.ResponseFilter;
 import com.ning.http.client.listener.TransferCompletionHandler;
+import com.ning.http.client.providers.netty.NettyAsyncHttpProvider;
 import com.ning.http.multipart.MultipartRequestEntity;
 import com.ning.http.util.AsyncHttpProviderUtils;
 import com.ning.http.util.AuthenticatorUtils;
@@ -545,10 +546,12 @@ private void configure(URI uri, HttpURLConnection urlConnection, Request request
                 urlConnection.setRequestProperty("Accept", "*/*");
             }
 
-            if (request.getHeaders().getFirstValue("User-Agent") == null && config.getUserAgent() != null) {
+            if (request.getHeaders().getFirstValue("User-Agent") != null) {
+                urlConnection.setRequestProperty("User-Agent", request.getHeaders().getFirstValue("User-Agent"));
+            } else if (config.getUserAgent() != null) {
                 urlConnection.setRequestProperty("User-Agent", config.getUserAgent());
             } else {
-                urlConnection.setRequestProperty("User-Agent", AsyncHttpProviderUtils.constructUserAgent(JDKAsyncHttpProvider.class));
+                urlConnection.setRequestProperty("User-Agent", AsyncHttpProviderUtils.constructUserAgent(NettyAsyncHttpProvider.class));
             }
 
             if (request.getCookies() != null && !request.getCookies().isEmpty()) {

src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java

@@ -614,12 +614,10 @@ private static HttpRequest construct(AsyncHttpClientConfig config,
             nettyRequest.setHeader(HttpHeaders.Names.ACCEPT, "*/*");
         }
 
-        if (request.getHeaders().getFirstValue("User-Agent") == null && config.getUserAgent() != null) {
-            nettyRequest.setHeader("User-Agent", config.getUserAgent());
+        if (request.getHeaders().getFirstValue("User-Agent") != null) {
+            nettyRequest.setHeader("User-Agent", request.getHeaders().getFirstValue("User-Agent"));
         } else if (config.getUserAgent() != null) {
             nettyRequest.setHeader("User-Agent", config.getUserAgent());
-        } else if (request.getHeaders().getFirstValue("User-Agent") != null) {
-            nettyRequest.setHeader("User-Agent", request.getHeaders().getFirstValue("User-Agent"));
         } else {
             nettyRequest.setHeader("User-Agent", AsyncHttpProviderUtils.constructUserAgent(NettyAsyncHttpProvider.class));
         }