X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FHTTP.java;fp=src%2Forg%2Fxwt%2FHTTP.java;h=84e5abb7c01f6472818ba185450cac423505385b;hb=9d07963a45f2147a62d8897e9c4245c224d98ccb;hp=eca310fd2e720af93ea47b919e6f39ef16cf340c;hpb=04739ad4085fdc3989ceaebc890649d1568063a2;p=org.ibex.core.git

diff --git a/src/org/xwt/HTTP.java b/src/org/xwt/HTTP.java
index eca310f..84e5abb 100644
--- a/src/org/xwt/HTTP.java
+++ b/src/org/xwt/HTTP.java
@@ -276,18 +276,16 @@ public class HTTP {
     }
 
     /** executes the PAC script and dispatches a call to one of the other attempt methods based on the result */
-    public Socket attemptPAC(org.xwt.js.JS.Callable pacFunc) {
+    public Socket attemptPAC(org.xwt.js.JSCallable pacFunc) {
         if (Log.verbose) Log.log(this, "evaluating PAC script");
         String pac = null;
         try {
-            org.xwt.js.JS.Array args = new org.xwt.js.JS.Array();
+            org.xwt.js.JSArray args = new org.xwt.js.JSArray();
             args.addElement(url.toString());
             args.addElement(url.getHost());
-            /* FIXME
             Object obj = pacFunc.call(args);
             if (Log.verbose) Log.log(this, "  PAC script returned \"" + obj + "\"");
             pac = obj.toString();
-            */
         } catch (Throwable e) {
             if (Log.on) Log.log(this, "PAC script threw exception " + e);
             return null;
@@ -358,7 +356,7 @@ public class HTTP {
         OUTER: do {
             if (pi != null) {
                 for(int i=0; i<pi.excluded.length; i++) if (host.equals(pi.excluded[i])) break OUTER;
-                if (sock == null && pi.proxyAutoConfigFunction != null) sock = attemptPAC(pi.proxyAutoConfigFunction);
+                if (sock == null && pi.proxyAutoConfigJSFunction != null) sock = attemptPAC(pi.proxyAutoConfigJSFunction);
                 if (sock == null && ssl && pi.httpsProxyHost != null) sock = attemptHttpProxy(pi.httpsProxyHost, pi.httpsProxyPort);
                 if (sock == null && pi.httpProxyHost != null) sock = attemptHttpProxy(pi.httpProxyHost, pi.httpProxyPort);
                 if (sock == null && pi.socksProxyHost != null) sock = attemptSocksProxy(pi.socksProxyHost, pi.socksProxyPort);
@@ -474,8 +472,8 @@ public class HTTP {
                 if (i+3<type2.length) log += Integer.toString(type2[i+3] & 0xff, 16) + " ";
                 Log.log(this, log);
             }
-            // FIXME: need to keep the connection open between type1 and type3
-            // FIXME: finish this
+            // FEATURE: need to keep the connection open between type1 and type3
+            // FEATURE: finish this
             //byte[] type3 = Proxy.NTLM.getResponse(
             //Proxy.Authorization.authorization2 = "NTLM " + Base64.encode(type3));
         }            
@@ -701,7 +699,7 @@ public class HTTP {
         public String[] excluded = null;
     
         /** the PAC script */
-        public JS.Callable proxyAutoConfigFunction = null;
+        public JSCallable proxyAutoConfigJSFunction = null;
     
         public static Proxy detectProxyViaManual() {
             Proxy ret = new Proxy();
@@ -753,8 +751,8 @@ public class HTTP {
             return ret;
         }
     
-        public static JS.Scope proxyAutoConfigRootScope = new ProxyAutoConfigRootScope();
-        public static JS.Callable getProxyAutoConfigFunction(String url) {
+        public static JSScope proxyAutoConfigRootJSScope = new ProxyAutoConfigRootJSScope();
+        public static JSCallable getProxyAutoConfigJSFunction(String url) {
             try { 
                 BufferedReader br = new BufferedReader(new InputStreamReader(new HTTP(url, true).GET()));
                 String s = null;
@@ -780,18 +778,15 @@ public class HTTP {
                     if (Log.on) Log.log(Proxy.class, script);
                 }
 
-                Function scr = JS.parse("PAC script at " + url, 0, new StringReader(script));
-                // FIXME
-                /*
-                scr.call(new JS.Array(), proxyAutoConfigRootScope);
-                */
-                return (JS.Callable)proxyAutoConfigRootScope.get("FindProxyForURL");
+                JSFunction scr = JS.parse("PAC script at " + url, 0, new StringReader(script));
+                scr.cloneWithNewJSScope(proxyAutoConfigRootJSScope).call(new JSArray());
+                return (JSCallable)proxyAutoConfigRootJSScope.get("FindProxyForURL");
             } catch (Exception e) {
                 if (Log.on) {
                     Log.log(Platform.class, "WPAD detection failed due to:");
                     if (e instanceof JS.Exn) {
                         try {
-                            org.xwt.js.JS.Array arr = new org.xwt.js.JS.Array();
+                            org.xwt.js.JSArray arr = new org.xwt.js.JSArray();
                             arr.addElement(((JS.Exn)e).getObject());
                         } catch (Exception e2) {
                             Log.log(Platform.class, e);
@@ -821,7 +816,6 @@ public class HTTP {
                 if (authorization != oldAuth) return;
                 if (Log.on) Log.log(Authorization.class, "displaying proxy authorization dialog");
                 /*
-                  FIXME
                 Message.Q.add(new Message() {
                         public void perform() {
                             Box b = new Box();
@@ -839,11 +833,11 @@ public class HTTP {
         }
 
 
-        // ProxyAutoConfigRootScope ////////////////////////////////////////////////////////////////////
+        // ProxyAutoConfigRootJSScope ////////////////////////////////////////////////////////////////////
 
-        public static class ProxyAutoConfigRootScope extends JS.GlobalScope {
+        public static class ProxyAutoConfigRootJSScope extends JSScope.Global {
 
-            public ProxyAutoConfigRootScope() { super(null); }
+            public ProxyAutoConfigRootJSScope() { super(null); }
         
             public Object get(Object name) {
                 if (name.equals("isPlainHostName")) return isPlainHostName;
@@ -862,36 +856,36 @@ public class HTTP {
                 else return super.get(name);
             }
         
-            private static final JS.Obj proxyConfigBindings = new JS.Obj();
-            private static final JS.Obj ProxyConfig = new JS.Obj() {
+            private static final JSObj proxyConfigBindings = new JSObj();
+            private static final JSObj ProxyConfig = new JSObj() {
                     public Object get(Object name) {
                         if (name.equals("bindings")) return proxyConfigBindings;
                         return null;
                     }
                 };
         
-            private static final JS.Callable isPlainHostName = new JS.Callable() {
-                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+            private static final JSCallable isPlainHostName = new JSCallable() {
+                    public Object call(org.xwt.js.JSArray args) throws JS.Exn {
                         return (args.elementAt(0).toString().indexOf('.') == -1) ? Boolean.TRUE : Boolean.FALSE;
                     }
                 };
         
-            private static final JS.Callable dnsDomainIs = new JS.Callable() {
-                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+            private static final JSCallable dnsDomainIs = new JSCallable() {
+                    public Object call(org.xwt.js.JSArray args) throws JS.Exn {
                         return (args.elementAt(0).toString().endsWith(args.elementAt(1).toString())) ? Boolean.TRUE : Boolean.FALSE;
                     }
                 };
         
-            private static final JS.Callable localHostOrDomainIs = new JS.Callable() {
-                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+            private static final JSCallable localHostOrDomainIs = new JSCallable() {
+                    public Object call(org.xwt.js.JSArray args) throws JS.Exn {
                         return (args.elementAt(0).toString().equals(args.elementAt(1).toString()) || 
                                 (args.elementAt(0).toString().indexOf('.') == -1 && args.elementAt(1).toString().startsWith(args.elementAt(0).toString()))) ?
                             Boolean.TRUE : Boolean.FALSE;
                     }
                 };
         
-            private static final JS.Callable isResolvable = new JS.Callable() {
-                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+            private static final JSCallable isResolvable = new JSCallable() {
+                    public Object call(org.xwt.js.JSArray args) throws JS.Exn {
                         try {
                             return (InetAddress.getByName(args.elementAt(0).toString()) != null) ? Boolean.TRUE : Boolean.FALSE;
                         } catch (UnknownHostException e) {
@@ -900,8 +894,8 @@ public class HTTP {
                     }
                 };
         
-            private static final JS.Callable isInNet = new JS.Callable() {
-                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+            private static final JSCallable isInNet = new JSCallable() {
+                    public Object call(org.xwt.js.JSArray args) throws JS.Exn {
                         if (args.length() != 3) return Boolean.FALSE;
                         try {
                             byte[] host = InetAddress.getByName(args.elementAt(0).toString()).getAddress();
@@ -918,8 +912,8 @@ public class HTTP {
                     }
                 };
         
-            private static final JS.Callable dnsResolve = new JS.Callable() {
-                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+            private static final JSCallable dnsResolve = new JSCallable() {
+                    public Object call(org.xwt.js.JSArray args) throws JS.Exn {
                         try {
                             return InetAddress.getByName(args.elementAt(0).toString()).getHostAddress();
                         } catch (UnknownHostException e) {
@@ -928,8 +922,8 @@ public class HTTP {
                     }
                 };
         
-            private static final JS.Callable myIpAddress = new JS.Callable() {
-                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+            private static final JSCallable myIpAddress = new JSCallable() {
+                    public Object call(org.xwt.js.JSArray args) throws JS.Exn {
                         try {
                             return InetAddress.getLocalHost().getHostAddress();
                         } catch (UnknownHostException e) {
@@ -939,8 +933,8 @@ public class HTTP {
                     }
                 };
         
-            private static final JS.Callable dnsDomainLevels = new JS.Callable() {
-                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+            private static final JSCallable dnsDomainLevels = new JSCallable() {
+                    public Object call(org.xwt.js.JSArray args) throws JS.Exn {
                         String s = args.elementAt(0).toString();
                         int i = 0;
                         while((i = s.indexOf('.', i)) != -1) i++;
@@ -957,8 +951,8 @@ public class HTTP {
                 return false;
             }
         
-            private static final JS.Callable shExpMatch = new JS.Callable() {
-                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+            private static final JSCallable shExpMatch = new JSCallable() {
+                    public Object call(org.xwt.js.JSArray args) throws JS.Exn {
                         StringTokenizer st = new StringTokenizer(args.elementAt(1).toString(), "*", false);
                         String[] arr = new String[st.countTokens()];
                         String s = args.elementAt(0).toString();
@@ -969,8 +963,8 @@ public class HTTP {
         
             public static String[] days = { "SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT" };
         
-            private static final JS.Callable weekdayRange = new JS.Callable() {
-                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+            private static final JSCallable weekdayRange = new JSCallable() {
+                    public Object call(org.xwt.js.JSArray args) throws JS.Exn {
                         TimeZone tz = (args.length() < 3 || args.elementAt(2) == null || !args.elementAt(2).equals("GMT")) ? TimeZone.getTimeZone("UTC") : TimeZone.getDefault();
                         Calendar c = new GregorianCalendar();
                         c.setTimeZone(tz);
@@ -995,14 +989,14 @@ public class HTTP {
                     }
                 };
         
-            private static final JS.Callable dateRange = new JS.Callable() {
-                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+            private static final JSCallable dateRange = new JSCallable() {
+                    public Object call(org.xwt.js.JSArray args) throws JS.Exn {
                         throw new JS.Exn("XWT does not support dateRange() in PAC scripts");
                     }
                 };
         
-            private static final JS.Callable timeRange = new JS.Callable() {
-                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+            private static final JSCallable timeRange = new JSCallable() {
+                    public Object call(org.xwt.js.JSArray args) throws JS.Exn {
                         throw new JS.Exn("XWT does not support timeRange() in PAC scripts");
                     }
                 };
@@ -1149,7 +1143,7 @@ public class HTTP {
                 System.arraycopy(highHash, 0, lmHash, 8, 8);
                 return lmHash;
                 */
-                return null; // FIXME
+                return null;
             }
 
             /**
@@ -1215,7 +1209,7 @@ public class HTTP {
                 System.arraycopy(highResponse, 0, lmResponse, 16, 8);
                 return lmResponse;
                 */
-                return null; // FIXME
+                return null;
             }
 
             /**