Copy default config if present before per request timeouts setting in (OpenFeign#734)

yfei-z · velo · commit fa30e55d93f5 · 2018-07-06T17:33:28.000+12:00
ApacheHttpClient
diff --git a/httpclient/src/main/java/feign/httpclient/ApacheHttpClient.java b/httpclient/src/main/java/feign/httpclient/ApacheHttpClient.java
@@ -20,6 +20,7 @@
 import org.apache.http.StatusLine;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.Configurable;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.methods.RequestBuilder;
 import org.apache.http.client.utils.URIBuilder;
@@ -89,8 +90,7 @@ HttpUriRequest toHttpUriRequest(Request request, Request.Options options)
     RequestBuilder requestBuilder = RequestBuilder.create(request.method());
 
     // per request timeouts
-    RequestConfig requestConfig = RequestConfig
-        .custom()
+    RequestConfig requestConfig = (client instanceof Configurable ? RequestConfig.copy(((Configurable) client).getConfig()) : RequestConfig.custom())
         .setConnectTimeout(options.connectTimeoutMillis())
         .setSocketTimeout(options.readTimeoutMillis())
         .build();
