X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FHTTP.java;h=3dc73da2aec36fb2732dff9c7bc94f947365a320;hb=55c3195af733f3de6b7894f4c4a96f7b50f58c11;hp=03fc99726e252c2274782c29c575431fb3715bfa;hpb=ae9e8e08d0feff31f90ce99708950eda14a81ef5;p=org.ibex.core.git

diff --git a/src/org/xwt/HTTP.java b/src/org/xwt/HTTP.java
index 03fc997..3dc73da 100644
--- a/src/org/xwt/HTTP.java
+++ b/src/org/xwt/HTTP.java
@@ -1,21 +1,24 @@
-// Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL]package org.xwt;
+// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.xwt;
 
 import java.net.*;
 import java.io.*;
 import java.util.*;
+import org.xwt.js.*;
 import org.xwt.util.*;
-import org.mozilla.javascript.*;
+import org.bouncycastle.util.encoders.Base64;
+import org.bouncycastle.crypto.digests.*;
 
 /**
- *  A crude HTTP[S] connection implementation with support for proxies, since not all Java libraries
- *  (particularly GCJ's) support proxies.
- *
- *  FEATURE: implement pipelining
+ *  This object encapsulates a *single* HTTP connection. Multiple requests may be pipelined over a connection (thread-safe),
+ *  although any IOException encountered in a request will invalidate all later requests.
  */
 public class HTTP {
 
-    /** the URL to connect to */
+    /** the URL as passed to the original constructor; this is never changed */
+    final String originalUrl;
+
+    /** the URL to connect to; this is munged when the url is parsed */
     URL url = null;
 
     /** the host to connect to */
@@ -36,62 +39,130 @@ public class HTTP {
     /** the socket's inputstream */
     InputStream in = null;
 
-    /** the socket's outputstream */
-    OutputStream out = null;
-
-    /** the content-type of the data being received */
-    String contentType = null;
+    /** the username and password portions of the URL */
+    String userInfo = null;
 
-    /** the content-length of the data being recieved */
-    int contentLength = 0;
+    /** cache of userInfo strings, keyed on originalUrl */
+    private static Hashtable authCache = new Hashtable();
 
-    /** additional headers to be transmitted */
-    String headers = "";
+    /** this is null if the current request is the first request on
+     *  this HTTP connection; otherwise it is a Semaphore which will be
+     *  released once the request ahead of us has recieved its response
+     */
+    Semaphore okToRecieve = null;
 
     /** cache for resolveAndCheckIfFirewalled() */
     static Hashtable resolvedHosts = new Hashtable();
 
+    /** if any request encounters an IOException, the entire HTTP connection is invalidated */
+    boolean invalid = false;
 
-    // Constructor ////////////////////////////////////////////////////////////////////////////////////////
+    /** true iff we are allowed to skip the resolve check (only allowed when we're downloading the PAC script) */
+    boolean skipResolveCheck = false;
 
-    public HTTP(String url) throws MalformedURLException, IOException { this(url, false); }
-    public HTTP(String url, boolean skipResolveCheck) throws MalformedURLException, IOException {
-        if (url.startsWith("https:")) { url = "http" + url.substring(5); ssl = true; }
-        if (!url.startsWith("http:")) throw new HTTPException("HTTP only supports http/https urls");
-        this.url = new URL(url);
-        port = this.url.getPort();
-        path = this.url.getFile();
-        if (port == -1) port = ssl ? 443 : 80;
-        host = this.url.getHost();
-        if (Log.on) Log.log(this, "creating HTTP object for connection to " + host + ":" + port);
-        addHeader("Host", host);                                           // host header is always sent verbatim
-        if (!skipResolveCheck) resolveAndCheckIfFirewalled(host);   // might have to use the strict IP if behind a proxy
+    /** true iff we're using a proxy */
+    boolean proxied = false;
 
-        ProxyInfo pi = Platform.detectProxy();
-        if (sock == null && pi != null && pi.proxyAutoConfigFunction != null) sock = attemptPAC(pi.proxyAutoConfigFunction);
-        if (sock == null && pi != null && ssl && pi.httpsProxyHost != null) sock = attemptHttpProxy(pi.httpsProxyHost, pi.httpsProxyPort);
-        if (sock == null && pi != null && pi.httpProxyHost != null) sock = attemptHttpProxy(pi.httpProxyHost, pi.httpProxyPort);
-        if (sock == null && pi != null && pi.socksProxyHost != null) sock = attemptSocksProxy(pi.socksProxyHost, pi.socksProxyPort);
-        if (sock == null) sock = attemptDirect();
-        if (sock == null) throw new HTTPException("all socket creation attempts have failed");
+
+    // Public Methods ////////////////////////////////////////////////////////////////////////////////////////
+
+    public HTTP(String url) { this(url, false); }
+    public HTTP(String url, boolean skipResolveCheck) {
+        originalUrl = url;
+        this.skipResolveCheck = skipResolveCheck;
+    }
+
+    /** Performs an HTTP GET request */
+    public HTTPInputStream GET() throws IOException { return makeRequest(null, null); }
+
+    /** Performs an HTTP POST request; content is appended to the headers (so it should include a blank line to delimit the beginning of the body) */
+    public HTTPInputStream POST(String contentType, String content) throws IOException { return makeRequest(contentType, content); }
+
+    /**
+     *  This method isn't synchronized; however, only one thread can be in the inner synchronized block at a time, and the rest of
+     *  the method is protected by in-order one-at-a-time semaphore lock-steps
+     */
+    private HTTPInputStream makeRequest(String contentType, String content) throws IOException {
+
+        // Step 1: send the request and establish a semaphore to stop any requests that pipeline after us
+        Semaphore blockOn = null;
+        Semaphore releaseMe = null;
+        synchronized(this) {
+            if (invalid) throw new HTTPException("connection failed on a previous pipelined call");
+            try {
+                connect();
+                sendRequest(contentType, content);
+            } catch (IOException e) {
+                invalid = true;
+                throw e;
+            }
+            blockOn = okToRecieve;
+            releaseMe = okToRecieve = new Semaphore();
+        }
+        
+        // Step 2: wait for requests ahead of us to complete, then read the reply off the stream
+        boolean doRelease = true;
+        try {
+            if (blockOn != null) blockOn.block();
+            if (invalid) throw new HTTPException("connection failed on a previous pipelined call");
+            
+            Hashtable h = in == null ? null : parseHeaders(in);
+            if (h == null) {
+                // sometimes the server chooses to close the stream between requests
+                in = null; sock = null;
+                releaseMe.release();
+                return makeRequest(contentType, content);
+            }
+
+            String reply = h.get("STATUSLINE").toString();
+            
+            if (reply.startsWith("407") || reply.startsWith("401")) {
+                
+                if (reply.startsWith("407")) doProxyAuth(h, content == null ? "GET" : "POST");
+                else doWebAuth(h, content == null ? "GET" : "POST");
+                
+                if (h.get("HTTP").equals("1.0") && h.get("content-length") == null) {
+                    if (Log.on) Log.log(this, "proxy returned an HTTP/1.0 reply with no content-length...");
+                    in = null; sock = null;
+                } else {
+                    int cl = h.get("content-length") == null ? -1 : Integer.parseInt(h.get("content-length").toString());
+                    new HTTPInputStream(in, cl, releaseMe).close();
+                }
+                releaseMe.release();
+                return makeRequest(contentType, content);
+                
+            } else if (reply.startsWith("2")) {
+                if (h.get("HTTP").equals("1.0") && h.get("content-length") == null)
+                    throw new HTTPException("XWT does not support HTTP/1.0 servers which fail to return the Content-Length header");
+                int cl = h.get("content-length") == null ? -1 : Integer.parseInt(h.get("content-length").toString());
+                HTTPInputStream ret = new HTTPInputStream(in, cl, releaseMe);
+                doRelease = false;
+                return ret;
+                
+            } else {
+                throw new HTTPException("HTTP Error: " + reply);
+                
+            }
+            
+        } catch (IOException e) { invalid = true; throw e;
+        } finally { if (doRelease) releaseMe.release();
+        }
     }
 
 
     // Safeguarded DNS Resolver ///////////////////////////////////////////////////////////////////////////
 
     /**
-     *  resolves the hostname and returns it as a string in the form "x.y.z.w", except for the special case "xmlrpc.xwt.org".
+     *  resolves the hostname and returns it as a string in the form "x.y.z.w"
      *  @throws HTTPException if the host falls within a firewalled netblock
      */
     private void resolveAndCheckIfFirewalled(String host) throws HTTPException {
 
-        // special case
-        if (host.equals("xmlrpc.xwt.org")) return;
-
         // cached
         if (resolvedHosts.get(host) != null) return;
 
-        if (Log.on) Log.log(this, "  resolveAndCheckIfFirewalled: resolving " + host);
+        // if all scripts are trustworthy (local FS), continue
+        if (Main.originAddr == null) return;
 
         // resolve using DNS
         try {
@@ -104,17 +175,7 @@ public class HTTP {
             return;
         } catch (UnknownHostException uhe) { }
 
-        // resolve using xmlrpc.xwt.org
         if (Platform.detectProxy() == null) throw new HTTPException("could not resolve hostname \"" + host + "\" and no proxy configured");
-        if (Log.on) Log.log(this, "  could not resolve host " + host + "; using xmlrpc.xwt.org to ensure security");
-        try {
-            Object ret = new XMLRPC("http://xmlrpc.xwt.org/RPC2/", "dns.resolve").call(new Object[] { host });
-            if (ret == null || !(ret instanceof String)) throw new Exception("    xmlrpc.xwt.org returned non-String: " + ret);
-            resolvedHosts.put(host, ret);
-            return;
-        } catch (Throwable e) {
-            throw new HTTPException("exception while attempting to use xmlrpc.xwt.org to resolve " + host + ": " + e);
-        }
     }
 
 
@@ -123,7 +184,7 @@ public class HTTP {
     /** Attempts a direct connection */
     public Socket attemptDirect() {
         try {
-            if (Log.on) Log.log(this, "attempting to create unproxied socket to " + host + ":" + port + (ssl ? " [ssl]" : ""));
+            if (Log.verbose) Log.log(this, "attempting to create unproxied socket to " + host + ":" + port + (ssl ? " [ssl]" : ""));
             return Platform.getSocket(host, port, ssl, true);
         } catch (IOException e) {
             if (Log.on) Log.log(this, "exception in attemptDirect(): " + e);
@@ -134,11 +195,11 @@ public class HTTP {
     /** Attempts to use an HTTP proxy, employing the CONNECT method if HTTPS is requested */
     public Socket attemptHttpProxy(String proxyHost, int proxyPort) {
         try {
-            if (Log.on) Log.log(this, "attempting to create HTTP proxied socket using proxy " + proxyHost + ":" + proxyPort);
+            if (Log.verbose) Log.log(this, "attempting to create HTTP proxied socket using proxy " + proxyHost + ":" + proxyPort);
 
             Socket sock = Platform.getSocket(proxyHost, proxyPort, ssl, false);
             if (!ssl) {
-                path = "http://" + host + ":" + port + path;
+                if (!path.startsWith("http://")) path = "http://" + host + ":" + port + path;
             } else {
                 PrintWriter pw = new PrintWriter(new OutputStreamWriter(sock.getOutputStream()));
                 BufferedReader br = new BufferedReader(new InputStreamReader(sock.getInputStream()));
@@ -168,8 +229,8 @@ public class HTTP {
         InetAddress addr = null;
         try { addr = InetAddress.getByName(host); } catch (Exception e) { }
 
-        if (Log.on) Log.log(this, "attempting to create SOCKSv4" + (addr == null ? "" : "a") +
-                            " proxied socket using proxy " + proxyHost + ":" + proxyPort);
+        if (Log.verbose) Log.log(this, "attempting to create SOCKSv4" + (addr == null ? "" : "a") +
+                                 " proxied socket using proxy " + proxyHost + ":" + proxyPort);
 
         try {
             Socket sock = Platform.getSocket(proxyHost, proxyPort, ssl, false);
@@ -208,12 +269,15 @@ 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(Function pacFunc) {
-        if (Log.on) Log.log(this, "evaluating PAC script");
+    public Socket attemptPAC(org.xwt.js.JS.Callable pacFunc) {
+        if (Log.verbose) Log.log(this, "evaluating PAC script");
         String pac = null;
         try {
-            Object obj = pacFunc.call(Context.enter(), ProxyInfo.proxyAutoConfigRootScope, null, new Object[] { url.toString(), url.getHost() });
-            if (Log.on) Log.log(this, "  PAC script returned \"" + obj + "\"");
+            org.xwt.js.JS.Array args = new org.xwt.js.JS.Array();
+            args.addElement(url.toString());
+            args.addElement(url.getHost());
+            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);
@@ -223,7 +287,7 @@ public class HTTP {
         StringTokenizer st = new StringTokenizer(pac, ";", false);
         while (st.hasMoreTokens()) {
             String token = st.nextToken().trim();
-            if (Log.on) Log.log(this, "  trying \"" + token + "\"...");
+            if (Log.verbose) Log.log(this, "  trying \"" + token + "\"...");
             try {
                 Socket ret = null;
                 if (token.startsWith("DIRECT"))
@@ -246,60 +310,253 @@ public class HTTP {
 
     // Everything Else ////////////////////////////////////////////////////////////////////////////
 
-    /** returns the content-type of the reply */
-    public String getContentType() throws IOException {
-        getInputStream();
-        return contentType;
-    }
+    private synchronized void connect() throws IOException {
+        if (sock != null) {
+            if (in == null) in = new BufferedInputStream(sock.getInputStream());
+            return;
+        }
+        // grab the userinfo; gcj doesn't have java.net.URL.getUserInfo()
+        String url = originalUrl;
+        userInfo = url.substring(url.indexOf("://") + 3);
+        userInfo = userInfo.indexOf('/') == -1 ? userInfo : userInfo.substring(0, userInfo.indexOf('/'));
+        if (userInfo.indexOf('@') != -1) {
+            userInfo = userInfo.substring(0, userInfo.indexOf('@'));
+            url = url.substring(0, url.indexOf("://") + 3) + url.substring(url.indexOf('@') + 1);
+        } else {
+            userInfo = null;
+        }
 
-    /** returns the content-length of the reply */
-    public int getContentLength() throws IOException {
-        getInputStream();
-        return contentLength;
-    }
+        if (url.startsWith("https:")) {
+            this.url = new URL("http" + url.substring(5));
+            ssl = true;
+        } else if (!url.startsWith("http:")) {
+            throw new MalformedURLException("HTTP only supports http/https urls");
+        } else {
+            this.url = new URL(url);
+        }
+        if (!skipResolveCheck) resolveAndCheckIfFirewalled(this.url.getHost());
+        port = this.url.getPort();
+        path = this.url.getFile();
+        if (port == -1) port = ssl ? 443 : 80;
+        host = this.url.getHost();
+        if (Log.verbose) Log.log(this, "creating HTTP object for connection to " + host + ":" + port);
 
-    /** adds a header to the outbound transmission */
-    public void addHeader(String header, String value) throws HTTPException {
-        if (in != null) throw new HTTPException("attempt to add header after connection has been made");
-        headers += header + ": " + value + "\r\n";
+        Proxy pi = Platform.detectProxy();
+        if (sock == null && pi != null && pi.proxyAutoConfigFunction != null) sock = attemptPAC(pi.proxyAutoConfigFunction);
+        if (sock == null && pi != null && ssl && pi.httpsProxyHost != null) sock = attemptHttpProxy(pi.httpsProxyHost, pi.httpsProxyPort);
+        if (sock == null && pi != null && pi.httpProxyHost != null) sock = attemptHttpProxy(pi.httpProxyHost, pi.httpProxyPort);
+        if (sock == null && pi != null && pi.socksProxyHost != null) sock = attemptSocksProxy(pi.socksProxyHost, pi.socksProxyPort);
+        proxied = sock != null;
+        if (sock == null) sock = attemptDirect();
+        if (sock == null) throw new HTTPException("unable to contact host " + host);
+        if (in == null) in = new BufferedInputStream(sock.getInputStream());
     }
 
-    public OutputStream getOutputStream(int contentLength, String contentType) throws IOException {
-        if (out != null) return out;
-        if (in != null) throw new HTTPException("attempt to getOutputStream() after getInputStream()");
-        out = sock.getOutputStream();
-        PrintWriter pw = new PrintWriter(new OutputStreamWriter(out));
-        pw.print("POST " + path + " HTTP/1.0\r\n");
+    public void sendRequest(String contentType, String content) throws IOException {
+
+        PrintWriter pw = new PrintWriter(new OutputStreamWriter(sock.getOutputStream()));
+        if (content != null) {
+            pw.print("POST " + path + " HTTP/1.1\r\n");
+            int contentLength = content.substring(0, 2).equals("\r\n") ?
+                content.length() - 2 :
+                (content.length() - content.indexOf("\r\n\r\n") - 4);
+            pw.print("Content-Length: " + contentLength + "\r\n");
+            if (contentType != null) pw.print("Content-Type: " + contentType + "\r\n");
+        } else {
+            pw.print("GET " + path + " HTTP/1.1\r\n");
+        }
+        
         pw.print("User-Agent: XWT\r\n");
-        pw.print("Content-length: " + contentLength + "\r\n");
-        pw.print(headers);
-        if (contentType != null) pw.print("Content-Type: " + contentType + "\r\n");
+        pw.print("Host: " + (host + (port == 80 ? "" : (":" + port))) + "\r\n");
+        if (proxied) pw.print("X-RequestOrigin: " + Main.originHost + "\r\n");
+
+        if (Proxy.Authorization.authorization != null) pw.print("Proxy-Authorization: " + Proxy.Authorization.authorization2 + "\r\n");
+        if (authCache.get(originalUrl) != null) pw.print("Authorization: " + authCache.get(originalUrl) + "\r\n");
+
+        pw.print(content == null ? "\r\n" : content);
         pw.print("\r\n");
         pw.flush();
-        return out;
     }
 
-    public InputStream getInputStream() throws IOException {
-        if (in != null) return in;
-        if (out != null) {
-            out.flush();
+    private void doWebAuth(Hashtable h0, String method) throws IOException {
+        if (userInfo == null) throw new HTTPException("web server demanded username/password, but none were supplied");
+        Hashtable h = parseAuthenticationChallenge(h0.get("www-authenticate").toString());
+        
+        if (h.get("AUTHTYPE").equals("Basic")) {
+            if (authCache.get(originalUrl) != null) throw new HTTPException("username/password rejected");
+            authCache.put(originalUrl, "Basic " + new String(Base64.encode(userInfo.getBytes("US-ASCII"))));
+            
+        } else if (h.get("AUTHTYPE").equals("Digest")) {
+            if (authCache.get(originalUrl) != null && !"true".equals(h.get("stale"))) throw new HTTPException("username/password rejected");
+            String path2 = path;
+            if (path2.startsWith("http://") || path2.startsWith("https://")) {
+                path2 = path2.substring(path2.indexOf("://") + 3);
+                path2 = path2.substring(path2.indexOf('/'));
+            }
+            String A1 = userInfo.substring(0, userInfo.indexOf(':')) + ":" + h.get("realm") + ":" + userInfo.substring(userInfo.indexOf(':') + 1);
+            String A2 = method + ":" + path2;
+            authCache.put(originalUrl,
+                          "Digest " +
+                          "username=\"" + userInfo.substring(0, userInfo.indexOf(':')) + "\", " +
+                          "realm=\"" + h.get("realm") + "\", " +
+                          "nonce=\"" + h.get("nonce") + "\", " +
+                          "uri=\"" + path2 + "\", " +
+                          (h.get("opaque") == null ? "" : ("opaque=\"" + h.get("opaque") + "\", ")) + 
+                          "response=\"" + H(H(A1) + ":" + h.get("nonce") + ":" + H(A2)) + "\", " +
+                          "algorithm=MD5"
+                          );
+            
         } else {
-            PrintWriter pw = new PrintWriter(new OutputStreamWriter(sock.getOutputStream()));
-            pw.print("GET " + path + " HTTP/1.0\r\n");
-            pw.print("User-Agent: XWT\r\n");
-            pw.print(headers);
-            pw.print("\r\n");
-            pw.flush();
+            throw new HTTPException("unknown authentication type: " + h.get("AUTHTYPE"));
+        }
+    }
+
+    private void doProxyAuth(Hashtable h0, String method) throws IOException {
+        if (Log.on) Log.log(this, "Proxy AuthChallenge: " + h0.get("proxy-authenticate"));
+        Hashtable h = parseAuthenticationChallenge(h0.get("proxy-authenticate").toString());
+        String style = h.get("AUTHTYPE").toString();
+        String realm = h.get("realm").toString();
+
+        if (!realm.equals("Digest") || Proxy.Authorization.authorization2 == null || !"true".equals(h.get("stale")))
+            Proxy.Authorization.getPassword(realm, style, sock.getInetAddress().getHostAddress(), Proxy.Authorization.authorization);
+
+        if (style.equals("Basic")) {
+            Proxy.Authorization.authorization2 =
+                "Basic " + new String(Base64.encode(Proxy.Authorization.authorization.getBytes("US-ASCII")));
+            
+        } else if (style.equals("Digest")) {
+            String A1 = Proxy.Authorization.authorization.substring(0, userInfo.indexOf(':')) + ":" + h.get("realm") + ":" +
+                Proxy.Authorization.authorization.substring(Proxy.Authorization.authorization.indexOf(':') + 1);
+            String A2 = method + ":" + path;
+            Proxy.Authorization.authorization2 = 
+                "Digest " +
+                "username=\"" + Proxy.Authorization.authorization.substring(0, Proxy.Authorization.authorization.indexOf(':')) + "\", " +
+                "realm=\"" + h.get("realm") + "\", " +
+                "nonce=\"" + h.get("nonce") + "\", " +
+                "uri=\"" + path + "\", " +
+                (h.get("opaque") == null ? "" : ("opaque=\"" + h.get("opaque") + "\", ")) + 
+                "response=\"" + H(H(A1) + ":" + h.get("nonce") + ":" + H(A2)) + "\", " +
+                "algorithm=MD5";
+        }            
+    }
+
+
+    // HTTPException ///////////////////////////////////////////////////////////////////////////////////
+
+    static class HTTPException extends IOException { public HTTPException(String s) { super(s); } }
+
+
+    // HTTPInputStream ///////////////////////////////////////////////////////////////////////////////////
+
+    /** An input stream that represents a subset of a longer input stream. Supports HTTP chunking as well */
+    public class HTTPInputStream extends FilterInputStream {
+
+        /** if chunking, the number of bytes remaining in this subset; otherwise the remainder of the chunk */
+        private int length = 0;
+
+        /** this semaphore will be released when the stream is closed */
+        private Semaphore releaseMe = null;
+
+        /** indicates that we have encountered the zero-length terminator chunk */
+        boolean chunkedDone = false;
+
+        /** if we're on the first chunk, we don't pre-read a CRLF */
+        boolean firstChunk = true;
+
+        /** the length of the entire content body; -1 if chunked */
+        private int contentLength = 0;
+        public int getContentLength() { return contentLength; }
+
+        HTTPInputStream(InputStream in, int length, Semaphore releaseMe) {
+            super(in);
+            this.releaseMe = releaseMe;
+            this.contentLength = length;
+            this.length = length == -1 ? 0 : length;
+        }
+
+        public boolean markSupported() { return false; }
+        public int read(byte[] b) throws IOException { return read(b, 0, b.length); }
+        public long skip(long n) throws IOException { return read(null, -1, (int)n); }
+        public int available() throws IOException {
+            if (contentLength == -1) return java.lang.Math.min(super.available(), length);
+            return super.available();
         }
 
-        in = new BufferedInputStream(sock.getInputStream());
+        public int read() throws IOException {
+            byte[] b = new byte[1];
+            int ret = read(b, 0, 1);
+            return ret == -1 ? -1 : b[0] & 0xff;
+        }
+
+        private void readChunk() throws IOException {
+            if (chunkedDone) return;
+            if (!firstChunk) super.skip(2); // CRLF
+            firstChunk = false;
+            String chunkLen = "";
+            while(true) {
+                int i = super.read();
+                if (i == -1) throw new HTTPException("encountered end of stream while reading chunk length");
+
+                // FIXME: handle chunking extensions
+                if (i == '\r') {
+                    super.read();    // LF
+                    break;
+                } else {
+                    chunkLen += (char)i;
+                }
+            }
+            length = Integer.parseInt(chunkLen.trim(), 16);
+            if (length == 0) chunkedDone = true;
+        }
+
+        public int read(byte[] b, int off, int len) throws IOException {
+            boolean good = false;
+            try {
+                if (length == 0 && contentLength == -1) {
+                    readChunk();
+                    if (chunkedDone) { good = true; return -1; }
+                } else {
+                    if (length == 0) { good = true; return -1; }
+                }
+                if (len > length) len = length;
+                int ret = b == null ? (int)super.skip(len) : super.read(b, off, len);
+                if (ret >= 0) {
+                    length -= ret;
+                    good = true;
+                }
+                return ret;
+            } finally {
+                if (!good) invalid = true;
+            }
+        }
 
-        // we can't use a BufferedReader directly on the input stream,
-        // since it will buffer past the end of the headers
+        public void close() throws IOException {
+            if (contentLength == -1) {
+                while(!chunkedDone) {
+                    if (length != 0) skip(length);
+                    readChunk();
+                }
+                skip(2);
+            } else {
+                if (length != 0) skip(length);
+            }
+            if (releaseMe != null) releaseMe.release();
+        }
+    }
+
+
+    // Misc Helpers ///////////////////////////////////////////////////////////////////////////////////
+
+    /** reads a set of HTTP headers off of the input stream, returning null if the stream is already at its end */
+    private Hashtable parseHeaders(InputStream in) throws IOException {
+        Hashtable ret = new Hashtable();
+
+        // we can't use a BufferedReader directly on the input stream, since it will buffer past the end of the headers
         byte[] buf = new byte[4096];
         int buflen = 0;
         while(true) {
             int read = in.read();
+            if (read == -1 && buflen == 0) return null;
             if (read == -1) throw new HTTPException("stream closed while reading headers");
             buf[buflen++] = (byte)read;
             if (buflen >= 4 && buf[buflen - 4] == '\r' && buf[buflen - 3] == '\n' && buf[buflen - 2] == '\r' && buf[buflen - 1] == '\n') break;
@@ -309,64 +566,98 @@ public class HTTP {
                 buf = newbuf;
             }
         }
-        
-        BufferedReader headerReader = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(buf, 0, buflen)));
-        String s = headerReader.readLine();
-        if (!s.startsWith("HTTP/")) throw new HTTPException("Expected reply to start with \"HTTP/\"");
-        String reply = s.substring(s.indexOf(' ') + 1);
-        if (!reply.startsWith("2")) throw new HTTPException("HTTP Error: " + reply);
-        while((s = headerReader.readLine()) != null) {
-            if (s.length() > 15 && s.substring(0, 15).equalsIgnoreCase("content-length: "))
-                contentLength = Integer.parseInt(s.substring(15));
-        }
 
-        return in;
+        BufferedReader br = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(buf, 0, buflen)));
+        String s = br.readLine();
+        if (!s.startsWith("HTTP/")) throw new HTTPException("Expected reply to start with \"HTTP/\", got: " + s);
+        ret.put("STATUSLINE", s.substring(s.indexOf(' ') + 1));
+        ret.put("HTTP", s.substring(5, s.indexOf(' ')));
+
+        while((s = br.readLine()) != null && s.length() > 0) {
+            String front = s.substring(0, s.indexOf(':')).toLowerCase();
+            String back = s.substring(s.indexOf(':') + 1).trim();
+            // ugly hack: we never replace a Digest-auth with a Basic-auth (proxy + www)
+            if (front.endsWith("-authenticate") && ret.get(front) != null && !back.equals("Digest")) continue;
+            ret.put(front, back);
+        }
+        return ret;
     }
 
-
-
-    // HTTPException ///////////////////////////////////////////////////////////////////////////////////
-
-    static class HTTPException extends IOException {
-        public HTTPException(String s) { super(s); }
+    private Hashtable parseAuthenticationChallenge(String s) {
+        Hashtable ret = new Hashtable();
+
+        s = s.trim();
+        ret.put("AUTHTYPE", s.substring(0, s.indexOf(' ')));
+        s = s.substring(s.indexOf(' ')).trim();
+
+        while (s.length() > 0) {
+            String val = null;
+            String key = s.substring(0, s.indexOf('='));
+            s = s.substring(s.indexOf('=') + 1);
+            if (s.charAt(0) == '\"') {
+                s = s.substring(1);
+                val = s.substring(0, s.indexOf('\"'));
+                s = s.substring(s.indexOf('\"') + 1);
+            } else {
+                val = s.indexOf(',') == -1 ? s : s.substring(0, s.indexOf(','));
+                s = s.indexOf(',') == -1 ? "" : s.substring(s.indexOf(',') + 1);
+            }
+            if (s.length() > 0 && s.charAt(0) == ',') s = s.substring(1);
+            s = s.trim();
+            ret.put(key, val);
+        }
+        return ret;
     }
 
+    private String H(String s) throws IOException {
+        byte[] b = s.getBytes("US-ASCII");
+        MD5Digest md5 = new MD5Digest();
+        md5.update(b, 0, b.length);
+        byte[] out = new byte[md5.getDigestSize()];
+        md5.doFinal(out, 0);
+        String ret = "";
+        for(int i=0; i<out.length; i++) {
+            ret += "0123456789abcdef".charAt((out[i] & 0xf0) >> 4);
+            ret += "0123456789abcdef".charAt(out[i] & 0x0f);
+        }
+        return ret;
+    }
 
-    // ProxyInfo ///////////////////////////////////////////////////////////////////////////////////
-
-    public static class ProxyInfo {
 
-        public ProxyInfo() { }
+    // Proxy ///////////////////////////////////////////////////////////
 
+    /** encapsulates most of the proxy logic; some is shared in HTTP.java */
+    public static class Proxy {
+        
+        public Proxy() { }
+        
         /** the HTTP Proxy host to use */
         public String httpProxyHost = null;
-
+        
         /** the HTTP Proxy port to use */
         public int httpProxyPort = -1;
-
+        
         /** if a seperate proxy should be used for HTTPS, this is the hostname; otherwise, httpProxyHost is used */
         public String httpsProxyHost = null;
-
+    
         /** if a seperate proxy should be used for HTTPS, this is the port */
         public int httpsProxyPort = -1;
-
+    
         /** the SOCKS Proxy Host to use */
         public String socksProxyHost = null;
-
+    
         /** the SOCKS Proxy Port to use */
         public int socksProxyPort = -1;
-
+    
         /** hosts to be excluded from proxy use; wildcards permitted */
         public String[] excluded = null;
-
+    
         /** 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() {
-            ProxyInfo ret = new ProxyInfo();
-            
+        public JS.Callable proxyAutoConfigFunction = null;
+    
+        public static Proxy detectProxyViaManual() {
+            Proxy ret = new Proxy();
+        
             ret.httpProxyHost = Platform.getEnv("http_proxy");
             if (ret.httpProxyHost != null) {
                 if (ret.httpProxyHost.startsWith("http://")) ret.httpProxyHost = ret.httpProxyHost.substring(7);
@@ -378,7 +669,7 @@ public class HTTP {
                     ret.httpProxyPort = 80;
                 }
             }
-            
+        
             ret.httpsProxyHost = Platform.getEnv("https_proxy");
             if (ret.httpsProxyHost != null) {
                 if (ret.httpsProxyHost.startsWith("https://")) ret.httpsProxyHost = ret.httpsProxyHost.substring(7);
@@ -390,7 +681,7 @@ public class HTTP {
                     ret.httpsProxyPort = 80;
                 }
             }
-            
+        
             ret.socksProxyHost = Platform.getEnv("socks_proxy");
             if (ret.socksProxyHost != null) {
                 if (ret.socksProxyHost.startsWith("socks://")) ret.socksProxyHost = ret.socksProxyHost.substring(7);
@@ -402,51 +693,34 @@ public class HTTP {
                     ret.socksProxyPort = 80;
                 }
             }
-            
+        
             String noproxy = Platform.getEnv("no_proxy");
             if (noproxy != null) {
                 StringTokenizer st = new StringTokenizer(noproxy, ",");
                 ret.excluded = new String[st.countTokens()];
                 for(int i=0; st.hasMoreTokens(); i++) ret.excluded[i] = st.nextToken();
             }
-            
+        
             if (ret.httpProxyHost == null && ret.socksProxyHost == null) return null;
             return ret;
         }
-
-        // FIXME: search up from default domain
-        public static ProxyInfo detectProxyViaWPAD() {
-            try {
-                InetAddress wpad = InetAddress.getByName("wpad");
-                if (Log.on) Log.log(Platform.class, "using Web Proxy Auto Detection to detect proxy settings");
-                ProxyInfo ret = new ProxyInfo();
-                ret.proxyAutoConfigFunction = getProxyAutoConfigFunction("http://wpad/wpad.dat");
-                if (ret.proxyAutoConfigFunction != null) return ret;
-            } catch (UnknownHostException e) {
-                if (Log.on) Log.log(HTTP.class, "couldn't find WPAD server: " + e);
-            }
-            return null;
-        }
-
-        public static Scriptable proxyAutoConfigRootScope = new ProxyAutoConfigRootScope();
-
-        public static Function getProxyAutoConfigFunction(String url) {
+    
+        public static JS.Scope proxyAutoConfigRootScope = new ProxyAutoConfigRootScope();
+        public static JS.Callable getProxyAutoConfigFunction(String url) {
             try { 
-                Context cx = Context.enter();
-                cx.setOptimizationLevel(-1);
-                BufferedReader br = new BufferedReader(new InputStreamReader(new HTTP(url, true).getInputStream()));
+                BufferedReader br = new BufferedReader(new InputStreamReader(new HTTP(url, true).GET()));
                 String s = null;
                 String script = "";
                 while((s = br.readLine()) != null) script += s + "\n";
-                if (Log.on) Log.log(ProxyInfo.class, "successfully retrieved WPAD PAC:");
-                if (Log.on) Log.log(ProxyInfo.class, script);
-                
+                if (Log.on) Log.log(Proxy.class, "successfully retrieved WPAD PAC:");
+                if (Log.on) Log.log(Proxy.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(ProxyInfo.class, "Detected MS Proxy Server CARP Script, Host=" + host);
+                        if (Log.on) Log.log(Proxy.class, "Detected MS Proxy Server CARP Script, Host=" + host);
                         carpHosts.addElement(host);
                     }
                 if (carpHosts.size() > 0) {
@@ -454,34 +728,79 @@ public class HTTP {
                     for(int i=0; i<carpHosts.size(); i++)
                         script += "PROXY " + carpHosts.elementAt(i) + "; ";
                     script += "\";\n}";
-                    if (Log.on) Log.log(ProxyInfo.class, "DeCARPed PAC script:");
-                    if (Log.on) Log.log(ProxyInfo.class, script);
+                    if (Log.on) Log.log(Proxy.class, "DeCARPed PAC script:");
+                    if (Log.on) Log.log(Proxy.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);
+                JS.CompiledFunction scr = JS.parse("PAC script at " + url, 0, new StringReader(script));
+                scr.call(new JS.Array(), proxyAutoConfigRootScope);
+                return (JS.Callable)proxyAutoConfigRootScope.get("FindProxyForURL");
             } catch (Exception e) {
                 if (Log.on) {
                     Log.log(Platform.class, "WPAD detection failed due to:");
-                    if (e instanceof EcmaError) Log.log(HTTP.class, ((EcmaError)e).getMessage() + " at " +
-                                                        ((EcmaError)e).getSourceName() + ":" + ((EcmaError)e).getLineNumber());
+                    if (e instanceof JS.Exn) {
+                        try {
+                            org.xwt.js.JS.Array arr = new org.xwt.js.JS.Array();
+                            arr.addElement(((JS.Exn)e).getObject());
+                            // FIXME
+                            //XWT.recursivePrintObject.call();
+                        } catch (Exception e2) {
+                            Log.log(Platform.class, e);
+                        }
+                    }
                     else Log.log(Platform.class, e);
                 }
                 return null;
             }
         }
 
-        public static class ProxyAutoConfigRootScope extends ScriptableObject {
 
-            public String getClassName() { return "ProxyAutoConfigRootScope"; }
-            ProxyAutoConfigRootScope() { Context.enter().initStandardObjects(this); }
+        // Authorization ///////////////////////////////////////////////////////////////////////////////////
+
+        public static class Authorization {
+
+            static public String authorization = null;
+            static public String authorization2 = null;
+            static public Semaphore waitingForUser = new Semaphore();
+
+            public static synchronized void getPassword(final String realm, final String style, final String proxyIP, String oldAuth) {
+
+                // this handles cases where multiple threads hit the proxy auth at the same time -- all but one will block on the
+                // synchronized keyword. If 'authorization' changed while the thread was blocked, it means that the user entered
+                // a password, so we should reattempt authorization.
+
+                if (authorization != oldAuth) return;
+                if (Log.on) Log.log(Authorization.class, "displaying proxy authorization dialog");
+                MessageQueue.add(new Message() {
+                        public void perform() {
+                            Box b = new Box();
+                            Template.getTemplate("org.xwt.builtin.proxy_authorization", null).apply(b, null, null, null, 0, 0);
+                            b.put("realm", realm);
+                            b.put("proxyIP", proxyIP);
+                        }
+                    });
+
+                waitingForUser.block();
+                if (Log.on) Log.log(Authorization.class, "got proxy authorization info; re-attempting connection");
+            
+            }
+        }
+
+
+        // ProxyAutoConfigRootScope ////////////////////////////////////////////////////////////////////
 
-            public Object get(String name, Scriptable start) {
+        public static class ProxyAutoConfigRootScope extends JS.Scope {
+
+            public ProxyAutoConfigRootScope() { super(null); }
+        
+            // FIXME: needs "standard objects"
+
+            public Object get(Object name) {
                 if (name.equals("isPlainHostName")) return isPlainHostName;
                 else if (name.equals("dnsDomainIs")) return dnsDomainIs;
                 else if (name.equals("localHostOrDomainIs")) return localHostOrDomainIs;
                 else if (name.equals("isResolvable")) return isResolvable;
+                else if (name.equals("isInNet")) return isInNet;
                 else if (name.equals("dnsResolve")) return dnsResolve;
                 else if (name.equals("myIpAddress")) return myIpAddress;
                 else if (name.equals("dnsDomainLevels")) return dnsDomainLevels;
@@ -490,82 +809,77 @@ public class HTTP {
                 else if (name.equals("dateRange")) return dateRange;
                 else if (name.equals("timeRange")) return timeRange;
                 else if (name.equals("ProxyConfig")) return ProxyConfig;
-                else return super.get(name, start);
+                else return super.get(name);
             }
-
-            private static final JSObject proxyConfigBindings = new JSObject();
-            private static final JSObject ProxyConfig = new JSObject() {
-                    public Object get(String name, Scriptable start) {
+        
+            private static final JS.Obj proxyConfigBindings = new JS.Obj();
+            private static final JS.Obj ProxyConfig = new JS.Obj() {
+                    public Object get(Object name) {
                         if (name.equals("bindings")) return proxyConfigBindings;
                         return null;
                     }
                 };
-            
-            private static abstract class JSFunction extends JSObject implements Function {
-                JSFunction() { setSeal(true); }
-                public Scriptable construct(Context cx, Scriptable scope, java.lang.Object[] args) { return null; }
-            }
-
-            private static final JSFunction isPlainHostName = new JSFunction() {
-                    public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                        return (args[0].toString().indexOf('.') == -1) ? Boolean.TRUE : Boolean.FALSE;
+        
+            private static final JS.Callable isPlainHostName = new JS.Callable() {
+                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+                        return (args.elementAt(0).toString().indexOf('.') == -1) ? Boolean.TRUE : Boolean.FALSE;
                     }
                 };
-
-            private static final JSFunction dnsDomainIs = new JSFunction() {
-                    public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                        return (args[0].toString().endsWith(args[1].toString())) ? 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 {
+                        return (args.elementAt(0).toString().endsWith(args.elementAt(1).toString())) ? Boolean.TRUE : Boolean.FALSE;
                     }
                 };
-            
-            private static final JSFunction localHostOrDomainIs = new JSFunction() {
-                    public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                        return (args[0].toString().equals(args[1].toString()) || 
-                                (args[0].toString().indexOf('.') == -1 && args[1].toString().startsWith(args[0].toString()))) ?
+        
+            private static final JS.Callable localHostOrDomainIs = new JS.Callable() {
+                    public Object call(org.xwt.js.JS.Array 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 JSFunction isResolvable = new JSFunction() {
-                    public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
+        
+            private static final JS.Callable isResolvable = new JS.Callable() {
+                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
                         try {
-                            return (InetAddress.getByName(args[0].toString()) != null) ? Boolean.TRUE : Boolean.FALSE;
+                            return (InetAddress.getByName(args.elementAt(0).toString()) != null) ? Boolean.TRUE : Boolean.FALSE;
                         } catch (UnknownHostException e) {
                             return Boolean.FALSE;
                         }
                     }
                 };
-
-            private static final JSFunction isInNet = new JSFunction() {
-                    public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                        if (args.length != 3) return Boolean.FALSE;
+        
+            private static final JS.Callable isInNet = new JS.Callable() {
+                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+                        if (args.length() != 3) return Boolean.FALSE;
                         try {
-                            byte[] host = InetAddress.getByName(args[0].toString()).getAddress();
-                            byte[] net = InetAddress.getByName(args[1].toString()).getAddress();
-                            byte[] mask = InetAddress.getByName(args[2].toString()).getAddress();
+                            byte[] host = InetAddress.getByName(args.elementAt(0).toString()).getAddress();
+                            byte[] net = InetAddress.getByName(args.elementAt(1).toString()).getAddress();
+                            byte[] mask = InetAddress.getByName(args.elementAt(2).toString()).getAddress();
                             return ((host[0] & mask[0]) == net[0] &&
                                     (host[1] & mask[1]) == net[1] &&
                                     (host[2] & mask[2]) == net[2] &&
                                     (host[3] & mask[3]) == net[3]) ?
                                 Boolean.TRUE : Boolean.FALSE;
                         } catch (Exception e) {
-                            throw new JavaScriptException("exception in isInNet(): " + e);
+                            throw new JS.Exn("exception in isInNet(): " + e);
                         }
                     }
                 };
-
-            private static final JSFunction dnsResolve = new JSFunction() {
-                    public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
+        
+            private static final JS.Callable dnsResolve = new JS.Callable() {
+                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
                         try {
-                            return InetAddress.getByName(args[0].toString()).getHostAddress();
+                            return InetAddress.getByName(args.elementAt(0).toString()).getHostAddress();
                         } catch (UnknownHostException e) {
                             return null;
                         }
                     }
                 };
-
-            private static final JSFunction myIpAddress = new JSFunction() {
-                    public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
+        
+            private static final JS.Callable myIpAddress = new JS.Callable() {
+                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
                         try {
                             return InetAddress.getLocalHost().getHostAddress();
                         } catch (UnknownHostException e) {
@@ -574,76 +888,75 @@ public class HTTP {
                         }
                     }
                 };
-
-            private static final JSFunction dnsDomainLevels = new JSFunction() {
-                    public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                        String s = args[0].toString();
+        
+            private static final JS.Callable dnsDomainLevels = new JS.Callable() {
+                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+                        String s = args.elementAt(0).toString();
                         int i = 0;
                         while((i = s.indexOf('.', i)) != -1) i++;
                         return new Integer(i);
                     }
                 };
         
-            // FIXME: test this!
             private static boolean match(String[] arr, String s, int index) {
-                if (index == arr.length) return true;
+                if (index >= arr.length) return true;
                 for(int i=0; i<s.length(); i++) {
                     String s2 = s.substring(i);
-                    if (s2.startsWith(arr[index]) && match(arr, s.substring(arr[index].length()), index + 1)) return true;
+                    if (s2.startsWith(arr[index]) && match(arr, s2.substring(arr[index].length()), index + 1)) return true;
                 }
                 return false;
             }
-
-            private static final JSFunction shExpMatch = new JSFunction() {
-                    public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                        StringTokenizer st = new StringTokenizer(args[1].toString(), "*", false);
+        
+            private static final JS.Callable shExpMatch = new JS.Callable() {
+                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+                        StringTokenizer st = new StringTokenizer(args.elementAt(1).toString(), "*", false);
                         String[] arr = new String[st.countTokens()];
-                        String s = args[0].toString();
+                        String s = args.elementAt(0).toString();
                         for (int i=0; st.hasMoreTokens(); i++) arr[i] = st.nextToken();
                         return match(arr, s, 0) ? Boolean.TRUE : Boolean.FALSE;
                     }
                 };
-
+        
             public static String[] days = { "SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT" };
-
-            private static final JSFunction weekdayRange = new JSFunction() {
-                    public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                        TimeZone tz = (args.length < 3 || args[2] == null || !args[2].equals("GMT")) ? TimeZone.getTimeZone("UTC") : TimeZone.getDefault();
+        
+            private static final JS.Callable weekdayRange = new JS.Callable() {
+                    public Object call(org.xwt.js.JS.Array 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);
-                        c.setTime(new Date());
-                        Date d = c.getTime();
+                        c.setTime(new java.util.Date());
+                        java.util.Date d = c.getTime();
                         int day = d.getDay();
-
-                        String d1s = args[0].toString().toUpperCase();
+                    
+                        String d1s = args.elementAt(0).toString().toUpperCase();
                         int d1 = 0, d2 = 0;
                         for(int i=0; i<days.length; i++) if (days[i].equals(d1s)) d1 = i;
-
-                        if (args.length == 1)
+                    
+                        if (args.length() == 1)
                             return d1 == day ? Boolean.TRUE : Boolean.FALSE;
-
-                        String d2s = args[1].toString().toUpperCase();
+                    
+                        String d2s = args.elementAt(1).toString().toUpperCase();
                         for(int i=0; i<days.length; i++) if (days[i].equals(d2s)) d2 = i;
-
+                    
                         return
                             ((d1 <= d2 && day >= d1 && day <= d2) ||
                              (d1 > d2 && (day >= d1 || day <= d2))) ?
                             Boolean.TRUE : Boolean.FALSE;
                     }
                 };
-
-            private static final JSFunction dateRange = new JSFunction() {
-                    public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                        throw new JavaScriptException("XWT does not support dateRange() in PAC scripts");
+        
+            private static final JS.Callable dateRange = new JS.Callable() {
+                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+                        throw new JS.Exn("XWT does not support dateRange() in PAC scripts");
                     }
                 };
-
-            private static final JSFunction timeRange = new JSFunction() {
-                    public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                        throw new JavaScriptException("XWT does not support timeRange() in PAC scripts");
+        
+            private static final JS.Callable timeRange = new JS.Callable() {
+                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+                        throw new JS.Exn("XWT does not support timeRange() in PAC scripts");
                     }
                 };
-
+        
         }
 
     }