From 95a1db611fe9566fcaa98e05bc14aa01124ad650 Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 06:47:22 +0000 Subject: [PATCH] 2002/05/16 04:30:44 darcs-hash:20040130064722-2ba56-73ca1e4ff8089eed636447ac5a1948ed9a37388e.gz --- CHANGES | 2 ++ src/org/xwt/plat/Win32.java | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index ad1963c..7a1fc82 100644 --- a/CHANGES +++ b/CHANGES @@ -162,3 +162,5 @@ 15-May megacz Win32.xml, GCJ.xml, GCJHTask.java: ${gcc-prefix} now ends with a dash. +15-May megacz Win32.java: handled the oddball all-protocol proxy case + diff --git a/src/org/xwt/plat/Win32.java b/src/org/xwt/plat/Win32.java index a32d29b..c03ba52 100644 --- a/src/org/xwt/plat/Win32.java +++ b/src/org/xwt/plat/Win32.java @@ -143,10 +143,15 @@ 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; if (s.indexOf(':') == -1) continue; - String protocol = s.substring(0, s.indexOf('=')); - String host = s.substring(s.indexOf('=') + 1, s.indexOf(':')); + String protocol, host; + if (s.indexOf('=') == -1) { + protocol = "http"; + host = s.substring(0, s.indexOf(':')); + } else { + protocol = s.substring(0, s.indexOf('=')); + host = s.substring(s.indexOf('=') + 1, s.indexOf(':')); + } int port = Integer.parseInt(s.substring(s.indexOf(':') + 1)); if (protocol.equals("http")) { ret.httpProxyHost = host; -- 1.7.10.4