2002/06/23 21:37:02

darcs-hash:20040130064827-2ba56-eb304e5773b54bc151b8237ef7a2b6bd1fbf0123.gz

diff --git a/CHANGES b/CHANGES
index 7c81e01..c534078 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -218,3 +218,5 @@
 
 23-Jun megacz POSIX.cc: hackaround for wierd XFreeColormap() failure
 
+23-Jun megacz Win32.java: fix for YET ANOTHER wacky Win32 proxy string format
+

diff --git a/src/org/xwt/plat/Win32.java b/src/org/xwt/plat/Win32.java
index fd237ec..421e34a 100644 (file)
--- a/src/org/xwt/plat/Win32.java
+++ b/src/org/xwt/plat/Win32.java
@@ -146,9 +146,14 @@ public class Win32 extends GCJ {
         StringTokenizer st = new StringTokenizer(container[0], ";", false);
         while(st.hasMoreTokens()) try {
             String s = st.nextToken().trim();
-            if (s.indexOf(':') == -1) continue;
             String protocol, host;
-            if (s.indexOf('=') == -1) {
+            if (s.indexOf(':') == -1) {
+                continue;
+            } else if (s.indexOf("://") != -1) {
+                protocol = s.substring(0, s.indexOf("://"));
+                s = s.substring(s.indexOf("://") + 3);
+                host = s.substring(0, s.indexOf(':'));
+            } else if (s.indexOf('=') == -1) {
                 protocol = "http";
                 host = s.substring(0, s.indexOf(':'));
             } else {