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.*;
// 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;
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;
}
/** 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) {
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");
}
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();
// HTTPException ///////////////////////////////////////////////////////////////////////////////////
- static class HTTPException extends IOException {
- public HTTPException(String s) { super(s); }
- }
+ static class HTTPException extends IOException { public HTTPException(String s) { super(s); } }
// HTTPInputStream ///////////////////////////////////////////////////////////////////////////////////
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;
+ if (ret >= 0) {
+ length -= ret;
+ good = true;
+ }
return ret;
} finally {
if (!good) invalid = true;
}
skip(2);
} else {
- skip(length);
+ if (length != 0) skip(length);
}
if (releaseMe != null) releaseMe.release();
}