2003/06/16 08:03:15

[org.ibex.core.git] / src / org / xwt / HTTP.java

diff --git a/src/org/xwt/HTTP.java b/src/org/xwt/HTTP.java
index acdfcc3..a257878 100644 (file)
--- a/src/org/xwt/HTTP.java
+++ b/src/org/xwt/HTTP.java
@@ -4,8 +4,8 @@ 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.*;
 
@@ -39,9 +39,6 @@ public class HTTP {
     /** the socket's inputstream */
     InputStream in = null;
 
-    /** the socket's outputstream */
-    PrintWriter out = null;
-
     /** the username and password portions of the URL */
     String userInfo = null;
 
@@ -182,7 +179,9 @@ public class HTTP {
         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 });
+            JS.Array args = new JS.Array();
+            args.addElement(host);
+            Object ret = new XMLRPC("http://xmlrpc.xwt.org/RPC2/", "dns.resolve").call(args);
             if (ret == null || !(ret instanceof String)) throw new Exception("    xmlrpc.xwt.org returned non-String: " + ret);
             resolvedHosts.put(host, ret);
             return;
@@ -282,11 +281,14 @@ 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) {
+    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(), Proxy.proxyAutoConfigRootScope, null, new Object[] { url.toString(), url.getHost() });
+            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) {
@@ -321,24 +323,12 @@ public class HTTP {
     // Everything Else ////////////////////////////////////////////////////////////////////////////
 
     private synchronized void connect() throws IOException {
-        if (sock != null && !"".equals(originalUrl)) {
+        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;
-
-        if ("".equals(url)) {
-            userInfo = "";
-            this.url = null;
-            port = 80;
-            path = "/RPC2";
-            host = "";
-            in = System.in;
-            out = new PrintWriter(System.out);
-            return;
-        }
-
         userInfo = url.substring(url.indexOf("://") + 3);
         userInfo = userInfo.indexOf('/') == -1 ? userInfo : userInfo.substring(0, userInfo.indexOf('/'));
         if (userInfo.indexOf('@') != -1) {
@@ -347,7 +337,7 @@ public class HTTP {
         } else {
             userInfo = null;
         }
-        
+
         if (url.startsWith("https:")) {
             this.url = new URL("http" + url.substring(5));
             ssl = true;
@@ -356,7 +346,6 @@ public class HTTP {
         } else {
             this.url = new URL(url);
         }
-
         if (!skipResolveCheck) resolveAndCheckIfFirewalled(this.url.getHost());
         port = this.url.getPort();
         path = this.url.getFile();
@@ -372,12 +361,11 @@ public class HTTP {
         if (sock == null) sock = attemptDirect();
         if (sock == null) throw new HTTPException("unable to contact host " + host);
         if (in == null) in = new BufferedInputStream(sock.getInputStream());
-        if (out == null) out = new PrintWriter(new OutputStreamWriter(sock.getOutputStream()));
     }
 
     public void sendRequest(String contentType, String content) throws IOException {
 
-        PrintWriter pw = out;
+        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") ?
@@ -465,9 +453,7 @@ public class HTTP {
 
     // HTTPException ///////////////////////////////////////////////////////////////////////////////////
 
-    static class HTTPException extends IOException {
-        public HTTPException(String s) { super(s); }
-    }
+    static class HTTPException extends IOException { public HTTPException(String s) { super(s); } }
 
 
     // HTTPInputStream ///////////////////////////////////////////////////////////////////////////////////
@@ -498,6 +484,20 @@ public class HTTP {
             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();
+        }
+
+        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
@@ -522,11 +522,18 @@ public class HTTP {
         public int read(byte[] b, int off, int len) throws IOException {
             boolean good = false;
             try {
-                if (length == 0 && contentLength == -1) readChunk();
+                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 = super.read(b, off, len);
-                length -= ret;
-                good = true;
+                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;