Merge pull request docker-java#586 from loganbruns/always_use_http_to_contact_proxy_master

marcuslinke · marcuslinke · commit 8415919337ad · 2016-05-27T08:43:38.000+02:00
Always use HTTP to connect to proxy even when proxying HTTPS
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -231,7 +231,7 @@ private void configureProxy(ClientConfig clientConfig, String protocol) {
                 String hostname = address.getHostName();
                 int port = address.getPort();
 
-                clientConfig.property(ClientProperties.PROXY_URI, protocol + "://" + hostname + ":" + port);
+                clientConfig.property(ClientProperties.PROXY_URI, "http://" + hostname + ":" + port);
 
                 String httpProxyUser = System.getProperty(protocol + ".proxyUser");
                 if (httpProxyUser != null) {
