2003/06/03 00:53:07

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

diff --git a/src/org/xwt/HTTP.java b/src/org/xwt/HTTP.java
index b39240d..44e2f72 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.*;
 
@@ -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 });
+           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;
@@ -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.Function pacFunc) {
+       throw new Error("not implemented");
+       // FIXME
+       /*
         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() });
+            Object obj = pacFunc.call(Proxy.proxyAutoConfigRootScope, null, new Object[] { url.toString(), url.getHost() });
             if (Log.verbose) Log.log(this, "  PAC script returned \"" + obj + "\"");
             pac = obj.toString();
         } catch (Throwable e) {
@@ -314,6 +317,7 @@ public class HTTP {
         }
         if (Log.on) Log.log(this, "all PAC results exhausted");
         return null;
+       */
     }
 
 
@@ -365,7 +369,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");
@@ -416,6 +423,7 @@ public class HTTP {
     }
 
     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();
@@ -446,9 +454,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 ///////////////////////////////////////////////////////////////////////////////////
@@ -503,7 +509,12 @@ 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) return -1;
+               } else {
+                   if (length == 0) return -1;
+               }
                 if (len > length) len = length;
                 int ret = super.read(b, off, len);
                 length -= ret;
@@ -522,7 +533,7 @@ public class HTTP {
                 }
                 skip(2);
             } else {
-                skip(length);
+                if (length != 0) skip(length);
             }
             if (releaseMe != null) releaseMe.release();
         }