[JENKINS-5271] https wants to join the party

jenkinsci · Sep 18, 2011 · beb1666 · beb1666
1 parent 9207c21
commit beb1666
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/changelog.html b/changelog.html
@@ -55,6 +55,9 @@
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=bug>
+    Tools download does not respect proxy settings
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-5271">issue 5271</a>)
   <li class=bug>
     Recover from a corrupted JSON update data file automatically
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-7034">issue 7034</a>)

diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
@@ -655,7 +655,7 @@ public boolean installIfNecessaryFrom(URL archive, TaskListener listener, String
                 listener.getLogger().println(message);
 
             // for HTTP downloads, enable automatic retry for added resilience
-            InputStream in = archive.getProtocol().equals("http") ? ProxyConfiguration.getInputStream(archive) : con.getInputStream();
+            InputStream in = archive.getProtocol().startsWith("http") ? ProxyConfiguration.getInputStream(archive) : con.getInputStream();
             CountingInputStream cis = new CountingInputStream(in);
             try {
                 if(archive.toExternalForm().endsWith(".zip"))