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 e401f86..a257878 100644 (file)
--- a/src/org/xwt/HTTP.java
+++ b/src/org/xwt/HTTP.java
@@ -179,8 +179,8 @@ 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 {
-           Array args = new Array();
-           args.addElement(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);
@@ -285,9 +285,9 @@ public class HTTP {
         if (Log.verbose) Log.log(this, "evaluating PAC script");
         String pac = null;
         try {
-           org.xwt.js.Array args = new org.xwt.js.Array();
-           args.addElement(url.toString());
-           args.addElement(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();
@@ -484,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
@@ -509,17 +523,17 @@ public class HTTP {
             boolean good = false;
             try {
                 if (length == 0 && contentLength == -1) {
-                   readChunk();
-                   if (chunkedDone) { good = true; return -1; }
-               } else {
-                   if (length == 0) { good = true; return -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);
-               if (ret >= 0) {
-                   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;