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.*;
/** 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;
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;
}
/** 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) {
}
if (Log.on) Log.log(this, "all PAC results exhausted");
return null;
+ */
}
// 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) {
} else {
userInfo = null;
}
-
+
if (url.startsWith("https:")) {
this.url = new URL("http" + url.substring(5));
ssl = true;
} else {
this.url = new URL(url);
}
-
if (!skipResolveCheck) resolveAndCheckIfFirewalled(this.url.getHost());
port = this.url.getPort();
path = this.url.getFile();
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") ?
// 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) return -1;
+ } else {
+ if (length == 0) return -1;
+ }
if (len > length) len = length;
int ret = super.read(b, off, len);
length -= ret;