You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2017/11/26 15:26:19 UTC
httpcomponents-client git commit: HTTPCLIENT-1883: Added https.proxy*
to the list of system properties taken into account by HttpClientBuilder
Repository: httpcomponents-client
Updated Branches:
refs/heads/4.6.x f47908a82 -> e9c2a0f6b
HTTPCLIENT-1883: Added https.proxy* to the list of system properties taken into account by HttpClientBuilder
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/commit/e9c2a0f6
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/tree/e9c2a0f6
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/diff/e9c2a0f6
Branch: refs/heads/4.6.x
Commit: e9c2a0f6b3141b1808ccad5c39e37ce314db3b95
Parents: f47908a
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Sun Nov 26 16:03:06 2017 +0100
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Sun Nov 26 16:26:02 2017 +0100
----------------------------------------------------------------------
.../org/apache/http/impl/client/SystemDefaultHttpClient.java | 2 ++
.../main/java/org/apache/http/impl/client/HttpClientBuilder.java | 2 ++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/e9c2a0f6/httpclient/src/main/java-deprecated/org/apache/http/impl/client/SystemDefaultHttpClient.java
----------------------------------------------------------------------
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 b8cecf2..3eb6212 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;
* <li>javax.net.ssl.keyStorePassword</li>
* <li>http.proxyHost</li>
* <li>http.proxyPort</li>
+ * <li>https.proxyHost</li>
+ * <li>https.proxyPort</li>
* <li>http.nonProxyHosts</li>
* <li>http.keepAlive</li>
* <li>http.maxConnections</li>
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/e9c2a0f6/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
----------------------------------------------------------------------
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 68259f3..3a7c561 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;
* <li>https.cipherSuites</li>
* <li>http.proxyHost</li>
* <li>http.proxyPort</li>
+ * <li>https.proxyHost</li>
+ * <li>https.proxyPort</li>
* <li>http.nonProxyHosts</li>
* <li>http.keepAlive</li>
* <li>http.maxConnections</li>