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

[HTTPCLIENT-1714] Add HttpClientBuilder.setDnsResolver(DnsResolver). 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1726732 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary D. Gregory 2016-01-26 05:23:30 +00:00
parent 3c58addf11
commit 1ecdb608e5
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
RELEASE_NOTES.txt
View File

@ -1,3 +1,14 @@
Release 5.0-ALPHA2
-------------------
Changelog:
-------------------
* [HTTPCLIENT-1714] Add HttpClientBuilder.setDnsResolver(DnsResolver).
Contributed by Alexis Thaveau <alexis.thaveau at gmail.com>
Release 5.0-ALPHA1
-------------------

16
httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClientBuilder.java
View File

@ -43,6 +43,7 @@ import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocketFactory;
import org.apache.hc.client5.http.ConnectionKeepAliveStrategy;
import org.apache.hc.client5.http.DnsResolver;
import org.apache.hc.client5.http.SchemePortResolver;
import org.apache.hc.client5.http.SystemDefaultDnsResolver;
import org.apache.hc.client5.http.auth.AuthSchemeProvider;
@ -170,6 +171,7 @@ public class HttpClientBuilder {
private AuthenticationStrategy proxyAuthStrategy;
private UserTokenHandler userTokenHandler;
private HttpProcessor httpprocessor;
private DnsResolver dnsResolver;
private LinkedList<HttpRequestInterceptor> requestFirst;
private LinkedList<HttpRequestInterceptor> requestLast;
@ -685,6 +687,18 @@ public class HttpClientBuilder {
return this;
}
/**
* Assigns {@link DnsResolver} instance.
* <p>
* Please note this value can be overridden by the {@link #setConnectionManager(HttpClientConnectionManager)}
* method.
* </p>
*/
public final HttpClientBuilder setDnsResolver(final DnsResolver dnsResolver) {
this.dnsResolver = dnsResolver;
return this;
}
/**
* Assigns default {@link org.apache.hc.client5.http.auth.AuthScheme} registry which will
* be used for request execution if not explicitly set in the client execution
@ -906,7 +920,7 @@ public class HttpClientBuilder {
.build(),
null,
null,
null,
dnsResolver,
connTimeToLive,
connTimeToLiveTimeUnit != null ? connTimeToLiveTimeUnit : TimeUnit.MILLISECONDS);
if (defaultSocketConfig != null) {