From: adam <adam@megacz.com>
Date: Tue, 7 Mar 2006 07:53:36 +0000 (+0000)
Subject: hacks to get things working
X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=955ccd260ab1acc239ee60cef1ccd48115cc8597

hacks to get things working

darcs-hash:20060307075336-5007d-e4af6c76e8ae68d03ccebb9094dc09409343a499.gz
---

diff --git a/src/org/ibex/plat/Platform.java b/src/org/ibex/plat/Platform.java
index 32fea9d..e3e68e6 100644
--- a/src/org/ibex/plat/Platform.java
+++ b/src/org/ibex/plat/Platform.java
@@ -260,6 +260,8 @@ public abstract class Platform {
         if (alreadyDetectedProxy) return null;
         alreadyDetectedProxy = true;
 
+        // FIXME
+        /*
         Log.info(Platform.class, "attempting environment-variable DNS proxy detection");
         cachedProxyInfo = org.ibex.net.HTTP.Proxy.detectProxyViaManual();
         if (cachedProxyInfo != null) return cachedProxyInfo;
@@ -267,7 +269,7 @@ public abstract class Platform {
         Log.info(Platform.class, "attempting " + platform.getClass().getName() + " proxy detection");
         cachedProxyInfo = platform._detectProxy();
         if (cachedProxyInfo != null) return cachedProxyInfo;
-
+        */
         return cachedProxyInfo;
    } 
 
diff --git a/src/org/ibex/plat/Win32.java b/src/org/ibex/plat/Win32.java
index bdcaad6..d30ea04 100644
--- a/src/org/ibex/plat/Win32.java
+++ b/src/org/ibex/plat/Win32.java
@@ -87,7 +87,7 @@ public class Win32 extends GCJ {
         if (container[2] != null) {
             // FIXME
             //ret.proxyAutoConfigFunction = HTTP.Proxy.getProxyAutoConfigFunction(container[2]);
-            if (ret.proxyAutoConfigFunction != null) return ret;
+            //if (ret.proxyAutoConfigFunction != null) return ret;
         }
 
         if (container[0] == null) return null;