From 715ceedf360891d7bc636bc5d597db635b7161cd Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Mon, 4 Jun 2012 14:01:58 +0200
Subject: [PATCH] added option to ignore proxy settings

---
 .../main/java/sonia/scm/net/HttpRequest.java  | 33 +++++++++++++++++--
 .../java/sonia/scm/net/URLHttpClient.java     |  2 +-
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/net/HttpRequest.java b/scm-core/src/main/java/sonia/scm/net/HttpRequest.java
index ff4989e1a2..68c391c646 100644
--- a/scm-core/src/main/java/sonia/scm/net/HttpRequest.java
+++ b/scm-core/src/main/java/sonia/scm/net/HttpRequest.java
@@ -206,6 +206,18 @@ public class HttpRequest
     return disableHostnameValidation;
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @return
+   * @since 1.17
+   */
+  public boolean isIgnoreProxySettings()
+  {
+    return ignoreProxySettings;
+  }
+
   //~--- set methods ----------------------------------------------------------
 
   /**
@@ -282,6 +294,18 @@ public class HttpRequest
     return this;
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @param ignoreProxySettings
+   * @since 1.17
+   */
+  public void setIgnoreProxySettings(boolean ignoreProxySettings)
+  {
+    this.ignoreProxySettings = ignoreProxySettings;
+  }
+
   /**
    * Method description
    *
@@ -326,6 +350,12 @@ public class HttpRequest
 
   //~--- fields ---------------------------------------------------------------
 
+  /** Field description */
+  private Map<String, List<String>> headers;
+
+  /** Field description */
+  private boolean ignoreProxySettings = false;
+
   /** Field description */
   private boolean disableHostnameValidation = false;
 
@@ -335,9 +365,6 @@ public class HttpRequest
   /** Field description */
   private boolean decodeGZip = false;
 
-  /** Field description */
-  private Map<String, List<String>> headers;
-
   /** Field description */
   private Map<String, List<String>> parameters;
 
diff --git a/scm-webapp/src/main/java/sonia/scm/net/URLHttpClient.java b/scm-webapp/src/main/java/sonia/scm/net/URLHttpClient.java
index 62c2e67c0e..0d623fae4a 100644
--- a/scm-webapp/src/main/java/sonia/scm/net/URLHttpClient.java
+++ b/scm-webapp/src/main/java/sonia/scm/net/URLHttpClient.java
@@ -523,7 +523,7 @@ public class URLHttpClient implements HttpClient
   {
     HttpURLConnection connection = null;
 
-    if (configuration.isEnableProxy())
+    if (!request.isIgnoreProxySettings() && configuration.isEnableProxy())
     {
       if (logger.isDebugEnabled())
       {