X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FHTTP.java;h=002cb32385241a85af77474e698583df9d032e1c;hb=642d912992ac0471aa0655d9b93144e3ffdcd259;hp=52de89859660eea274467a6669fdf9eb6c9bd406;hpb=2405d5a50cd11a8068f43d28e3b630275ecdda66;p=org.ibex.core.git

diff --git a/src/org/xwt/HTTP.java b/src/org/xwt/HTTP.java
index 52de898..002cb32 100644
--- a/src/org/xwt/HTTP.java
+++ b/src/org/xwt/HTTP.java
@@ -287,7 +287,7 @@ public class HTTP {
         } else {
             PrintWriter pw = new PrintWriter(new OutputStreamWriter(sock.getOutputStream()));
             pw.print("GET " + path + " HTTP/1.0\r\n");
-            System.out.println("GET " + path + " HTTP/1.0\r\n");
+            System.out.print("GET " + path + " HTTP/1.0\r\n");
             pw.print("User-Agent: XWT\r\n");
             pw.print(headers);
             pw.print("\r\n");
@@ -420,6 +420,24 @@ public class HTTP {
                 while((s = br.readLine()) != null) script += s + "\n";
                 if (Log.on) Log.log(HTTP.ProxyInfo.class, "successfully retrieved WPAD PAC:");
                 if (Log.on) Log.log(HTTP.ProxyInfo.class, script);
+                
+                // MS CARP hack
+                Vector carpHosts = new Vector();
+                for(int i=0; i<script.length(); i++)
+                    if (script.regionMatches(i, "new Node(", 0, 9)) {
+                        String host = script.substring(i + 10, script.indexOf('\"', i + 11));
+                        if (Log.on) Log.log(HTTP.ProxyInfo.class, "Detected MS Proxy Server CARP Script, Host=" + host);
+                        carpHosts.addElement(host);
+                    }
+                if (carpHosts.size() > 0) {
+                    script = "function FindProxyForURL(url, host) {\nreturn \"";
+                    for(int i=0; i<carpHosts.size(); i++)
+                        script += "PROXY " + carpHosts.elementAt(i) + "; ";
+                    script += "\";\n}";
+                    if (Log.on) Log.log(HTTP.ProxyInfo.class, "DeCARPed PAC script:");
+                    if (Log.on) Log.log(HTTP.ProxyInfo.class, script);
+                }
+
                 Script scr = cx.compileReader(proxyAutoConfigRootScope, new StringReader(script), "PAC script at " + url, 0, null);
                 scr.exec(cx, proxyAutoConfigRootScope);
                 return (Function)proxyAutoConfigRootScope.get("FindProxyForURL", null);