Merge pull request jenkinsci#109 from schulzh/master

lanwen · lanwen · commit c43344a164a8 · 2016-01-28T15:00:03.000+03:00
Fixed incorrect proxy configuration of GitHubLoginFunction
diff --git a/src/main/java/org/jenkinsci/plugins/github/internal/GitHubLoginFunction.java b/src/main/java/org/jenkinsci/plugins/github/internal/GitHubLoginFunction.java
@@ -20,6 +20,7 @@
 import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
 import java.net.Proxy;
 import java.net.URL;
 
@@ -90,7 +91,11 @@ private Proxy getProxy(String apiUrl) {
         if (jenkins.proxy == null) {
             return Proxy.NO_PROXY;
         } else {
-            return jenkins.proxy.createProxy(apiUrl);
+            try {
+                return jenkins.proxy.createProxy(new URL(apiUrl).getHost());
+            } catch (MalformedURLException e) {
+                return jenkins.proxy.createProxy(apiUrl);
+            }
         }
     }
 
