From 8750946b6edb4111ae1fb8dcdbe73bd79e337e66 Mon Sep 17 00:00:00 2001
From: alexist <alexis.thaveau@gmail.com>
Date: Tue, 26 Jan 2016 00:20:11 +0100
Subject: [PATCH] Add dnsResolver

---
 .../apache/http/impl/client/HttpClientBuilder.java | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java b/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
index 9cf34397d1..943848cb6e 100644
--- a/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
+++ b/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
@@ -74,6 +74,7 @@
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.config.SocketConfig;
 import org.apache.http.conn.ConnectionKeepAliveStrategy;
+import org.apache.http.conn.DnsResolver;
 import org.apache.http.conn.HttpClientConnectionManager;
 import org.apache.http.conn.SchemePortResolver;
 import org.apache.http.conn.routing.HttpRoutePlanner;
@@ -168,6 +169,7 @@ public class HttpClientBuilder {
     private AuthenticationStrategy proxyAuthStrategy;
     private UserTokenHandler userTokenHandler;
     private HttpProcessor httpprocessor;
+    private DnsResolver dnsResolver;
 
     private LinkedList<HttpRequestInterceptor> requestFirst;
     private LinkedList<HttpRequestInterceptor> requestLast;
@@ -610,6 +612,16 @@ public final HttpClientBuilder setHttpProcessor(final HttpProcessor httpprocesso
         return this;
     }
 
+    /**
+     * Assigns {@link DnsResolver} instance.
+     * <p/>
+     * Please note this value can be overridden by the {@link #setConnectionManager(HttpClientConnectionManager)} method.
+     */
+    public final HttpClientBuilder setDnsResolver(final DnsResolver dnsResolver) {
+        this.dnsResolver = dnsResolver;
+        return this;
+    }
+
     /**
      * Assigns {@link HttpRequestRetryHandler} instance.
      * <p>
@@ -965,7 +977,7 @@ public CloseableHttpClient build() {
                         .build(),
                     null,
                     null,
-                    null,
+                    dnsResolver,
                     connTimeToLive,
                     connTimeToLiveTimeUnit != null ? connTimeToLiveTimeUnit : TimeUnit.MILLISECONDS);
             if (defaultSocketConfig != null) {