+2005-04-27 Chris Burdess <dog@gnu.org>
+
+ * java/net/protocol/http/HTTPURLConnection.java (connect): Accept
+ absolute and relative paths in Location header.
+
+2005-04-27 Chris Burdess <dog@gnu.org>
+
+ * gnu/java/net/protocol/http/HTTPURLConnection.java: Throw
+ FileNotFoundException and implement getErrorStream on 404.
+
2005-04-27 Sven de Marothy <sven@physto.se>
* java/util/TimeZone.java,
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
private Response response;
private ByteArrayInputStream responseSink;
+ private ByteArrayInputStream errorSink;
private HandshakeCompletedEvent handshakeEvent;
file = location.substring(end);
retry = true;
}
- // Otherwise this is not an HTTP redirect, can't follow
+ else if (location.length() > 0)
+ {
+ // Malformed absolute URI, treat as file part of URI
+ if (location.charAt(0) == '/')
+ {
+ // Absolute path
+ file = location;
+ }
+ else
+ {
+ // Relative path
+ int lsi = file.lastIndexOf('/');
+ file = (lsi == -1) ? "/" : file.substring(0, lsi + 1);
+ file += location;
+ }
+ retry = true;
+ }
}
else
{
responseSink = new ByteArrayInputStream(reader.toByteArray ());
+ if (response.getCode() == 404)
+ {
+ errorSink = responseSink;
+ throw new FileNotFoundException(url.toString());
+ }
}
}
while (retry);
return responseSink;
}
+ public InputStream getErrorStream()
+ {
+ return errorSink;
+ }
+
public Map getHeaderFields()
{
if (!connected)