From e249943247833df990c339e17b12209c1d2f4cdb Mon Sep 17 00:00:00 2001 From: Oleg Kalnichevski Date: Sun, 26 Nov 2017 16:03:06 +0100 Subject: [PATCH] HTTPCLIENT-1883: Added https.proxy* to the list of system properties taken into account by HttpClientBuilder --- .../org/apache/http/impl/client/SystemDefaultHttpClient.java | 2 ++ .../java/org/apache/http/impl/client/HttpClientBuilder.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/httpclient/src/main/java-deprecated/org/apache/http/impl/client/SystemDefaultHttpClient.java b/httpclient/src/main/java-deprecated/org/apache/http/impl/client/SystemDefaultHttpClient.java index b8cecf22c..3eb621261 100644 --- a/httpclient/src/main/java-deprecated/org/apache/http/impl/client/SystemDefaultHttpClient.java +++ b/httpclient/src/main/java-deprecated/org/apache/http/impl/client/SystemDefaultHttpClient.java @@ -59,6 +59,8 @@ import org.apache.http.params.HttpParams; *
  • javax.net.ssl.keyStorePassword
  • *
  • http.proxyHost
  • *
  • http.proxyPort
  • + *
  • https.proxyHost
  • + *
  • https.proxyPort
  • *
  • http.nonProxyHosts
  • *
  • http.keepAlive
  • *
  • http.maxConnections
  • 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 68259f3c7..3a7c5613b 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 @@ -139,6 +139,8 @@ import org.apache.http.util.VersionInfo; *
  • https.cipherSuites
  • *
  • http.proxyHost
  • *
  • http.proxyPort
  • + *
  • https.proxyHost
  • + *
  • https.proxyPort
  • *
  • http.nonProxyHosts
  • *
  • http.keepAlive
  • *
  • http.maxConnections