From: megacz <megacz@xwt.org>
Date: Fri, 30 Jan 2004 06:48:14 +0000 (+0000)
Subject: 2002/06/17 06:52:00
X-Git-Tag: RC3~1679
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=86f887828bf61c8eecbef05b88623a16005bb845;p=org.ibex.core.git

2002/06/17 06:52:00

darcs-hash:20040130064814-2ba56-cccc3e29d1e9b9e2a5fd7795000f6df9dac90e57.gz
---

diff --git a/CHANGES b/CHANGES
index 0dbdfb5..7507b93 100644
--- a/CHANGES
+++ b/CHANGES
@@ -197,3 +197,5 @@
 
 16-Jun megacz Template.java: fixed erroneous attribute checks for numbers and image/border
 
+16-Jun megacz HTTP.java: diabled xwt-httpProxy, etc
+
diff --git a/src/org/xwt/HTTP.java b/src/org/xwt/HTTP.java
index 002cb32..79528ac 100644
--- a/src/org/xwt/HTTP.java
+++ b/src/org/xwt/HTTP.java
@@ -364,7 +364,11 @@ public class HTTP {
         /** the PAC script */
         public Function proxyAutoConfigFunction = null;
 
+        // this method has been disabled because it was causing problems -- some domains are set up so that *.foo.com resolves
+        // to a single IP, for any value of *. If the client's home domain is foo.com, then xwt-proxy-httpHost will resolve erroneously.
         public static ProxyInfo detectProxyViaManual() {
+            return null;
+            /*
             try {
                 // continue iff one of the two resolves
                 try { InetAddress.getByName("xwt-proxy-httpHost"); }
@@ -392,6 +396,7 @@ public class HTTP {
                 if (Log.on) Log.log(Platform.class, "xwt-proxy-* detection failed due to: " + e);
                 return null;
             }
+            */
         }
 
         // FIXME: search up from default domain