X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FHTTP.java;h=d4d2249eed02b36d783b08d8f20c2a1b7b4211eb;hb=d5f0e6ca91a3359b09352d3df367d6b6bd22f096;hp=a491dcdf5871f7a6a82ea6491f51a9ad9ec7562c;hpb=3d84b8f03ccf40d0e8b0059100d4714a521e6b3c;p=org.ibex.core.git

diff --git a/src/org/xwt/HTTP.java b/src/org/xwt/HTTP.java
index a491dcd..d4d2249 100644
--- 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.*;
 
@@ -161,8 +161,6 @@ public class HTTP {
         // 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;
 
@@ -181,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 });
+	    Array args = new 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;
@@ -281,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.Array args = new org.xwt.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) {
@@ -365,7 +368,10 @@ public class HTTP {
         PrintWriter pw = new PrintWriter(new OutputStreamWriter(sock.getOutputStream()));
         if (content != null) {
             pw.print("POST " + path + " HTTP/1.1\r\n");
-            pw.print("Content-Length: " + content.length() + "\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");
@@ -447,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 ///////////////////////////////////////////////////////////////////////////////////
@@ -480,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
@@ -504,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;
@@ -523,7 +548,7 @@ public class HTTP {
                 }
                 skip(2);
             } else {
-                skip(length);
+                if (length != 0) skip(length);
             }
             if (releaseMe != null) releaseMe.release();
         }