Merge pull request #4 from escoem/JENKINS-31823

[JENKINS-31823] noProxyHost configuration is ignored
jenkinsci · Dec 4, 2015 · 2b13fa8 · 2b13fa8
2 parents f2e80df + d8cf150
commit 2b13fa8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>1.424</version>
+    <version>1.466</version>
   </parent>
 
   <artifactId>async-http-client</artifactId>

diff --git a/src/main/java/jenkins/plugins/asynchttpclient/AHCUtils.java b/src/main/java/jenkins/plugins/asynchttpclient/AHCUtils.java
@@ -21,8 +21,6 @@
 
 /**
  * Utility methods for dealing with {@link com.ning.http.client.AsyncHttpClient} from a Jenkins plugin.
- *
- * @author Stephen Connolly
  */
 public final class AHCUtils {
 
@@ -43,6 +41,14 @@ public static ProxyServer getProxyServer() {
         if (Jenkins.getInstance() != null && Jenkins.getInstance().proxy != null) {
             final ProxyConfiguration proxy = Jenkins.getInstance().proxy;
             proxyServer = new ProxyServer(proxy.name, proxy.port, proxy.getUserName(), proxy.getPassword());
+
+            if (proxy.noProxyHost != null) {
+                for (String s : proxy.noProxyHost.split("[ \t\n,|]+")) {
+                    if (s.length() > 0) {
+                        proxyServer.addNonProxyHost(s);
+                    }
+                }
+            }
         } else {
             proxyServer = null;
         }