提交 915f49b2 编写于 作者: C chegar

6756771: com.sun.net.httpserver.HttpServer should handle POSTs larger than 2Gig

Summary: update implementation to use long instead of int
Reviewed-by: michaelm
上级 585ffb5d
...@@ -43,7 +43,7 @@ class ExchangeImpl { ...@@ -43,7 +43,7 @@ class ExchangeImpl {
String method; String method;
URI uri; URI uri;
HttpConnection connection; HttpConnection connection;
int reqContentLen; long reqContentLen;
long rspContentLen; long rspContentLen;
/* raw streams which access the socket directly */ /* raw streams which access the socket directly */
InputStream ris; InputStream ris;
...@@ -79,7 +79,7 @@ class ExchangeImpl { ...@@ -79,7 +79,7 @@ class ExchangeImpl {
ServerImpl server; ServerImpl server;
ExchangeImpl ( ExchangeImpl (
String m, URI u, Request req, int len, HttpConnection connection String m, URI u, Request req, long len, HttpConnection connection
) throws IOException { ) throws IOException {
this.req = req; this.req = req;
this.reqHdrs = req.headers(); this.reqHdrs = req.headers();
...@@ -148,7 +148,7 @@ class ExchangeImpl { ...@@ -148,7 +148,7 @@ class ExchangeImpl {
if (uis != null) { if (uis != null) {
return uis; return uis;
} }
if (reqContentLen == -1) { if (reqContentLen == -1L) {
uis_orig = new ChunkedInputStream (this, ris); uis_orig = new ChunkedInputStream (this, ris);
uis = uis_orig; uis = uis_orig;
} else { } else {
......
...@@ -37,21 +37,21 @@ import com.sun.net.httpserver.spi.*; ...@@ -37,21 +37,21 @@ import com.sun.net.httpserver.spi.*;
*/ */
class FixedLengthInputStream extends LeftOverInputStream { class FixedLengthInputStream extends LeftOverInputStream {
private int remaining; private long remaining;
FixedLengthInputStream (ExchangeImpl t, InputStream src, int len) { FixedLengthInputStream (ExchangeImpl t, InputStream src, long len) {
super (t, src); super (t, src);
this.remaining = len; this.remaining = len;
} }
protected int readImpl (byte[]b, int off, int len) throws IOException { protected int readImpl (byte[]b, int off, int len) throws IOException {
eof = (remaining == 0); eof = (remaining == 0L);
if (eof) { if (eof) {
return -1; return -1;
} }
if (len > remaining) { if (len > remaining) {
len = remaining; len = (int)remaining;
} }
int n = in.read(b, off, len); int n = in.read(b, off, len);
if (n > -1) { if (n > -1) {
...@@ -65,7 +65,7 @@ class FixedLengthInputStream extends LeftOverInputStream { ...@@ -65,7 +65,7 @@ class FixedLengthInputStream extends LeftOverInputStream {
return 0; return 0;
} }
int n = in.available(); int n = in.available();
return n < remaining? n: remaining; return n < remaining? n: (int)remaining;
} }
public boolean markSupported () {return false;} public boolean markSupported () {return false;}
......
...@@ -53,7 +53,7 @@ class Request { ...@@ -53,7 +53,7 @@ class Request {
do { do {
startLine = readLine(); startLine = readLine();
/* skip blank lines */ /* skip blank lines */
} while (startLine.equals ("")); } while (startLine == null ? false : startLine.equals (""));
} }
......
...@@ -470,13 +470,13 @@ class ServerImpl implements TimeSource { ...@@ -470,13 +470,13 @@ class ServerImpl implements TimeSource {
String version = requestLine.substring (start); String version = requestLine.substring (start);
Headers headers = req.headers(); Headers headers = req.headers();
String s = headers.getFirst ("Transfer-encoding"); String s = headers.getFirst ("Transfer-encoding");
int clen = 0; long clen = 0L;
if (s !=null && s.equalsIgnoreCase ("chunked")) { if (s !=null && s.equalsIgnoreCase ("chunked")) {
clen = -1; clen = -1L;
} else { } else {
s = headers.getFirst ("Content-Length"); s = headers.getFirst ("Content-Length");
if (s != null) { if (s != null) {
clen = Integer.parseInt (s); clen = Long.parseLong(s);
} }
} }
ctx = contexts.findContext (protocol, uri.getPath()); ctx = contexts.findContext (protocol, uri.getPath());
......
/*
* Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/**
* @test
* @bug 6756771
* @summary com.sun.net.httpserver.HttpServer should handle POSTs larger than 2Gig
*/
import java.io.InputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
import java.net.InetSocketAddress;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.Socket;
import java.util.logging.*;
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler;
import com.sun.net.httpserver.HttpServer;
public class FixedLengthInputStream
{
static final long POST_SIZE = 4L * 1024L * 1024L * 1024L; // 4Gig
/* Remove when CR 6755625 is fixed */
static final String requestHeaders = ((new StringBuilder())
.append("POST /flis/ HTTP/1.1\r\n")
.append("User-Agent: Java/1.7.0\r\n")
.append("Host: localhost\r\n")
.append("Accept: text/html, image/gif, image/jpeg,")
.append( " *; q=.2, */*; q=.2\r\n")
.append("Content-Length: 4294967296\r\n\r\n")).toString();
void test(String[] args) throws IOException {
HttpServer httpServer = startHttpServer();
int port = httpServer.getAddress().getPort();
try {
/* Uncomment & when CR 6755625 is fixed, remove socket code
URL url = new URL("http://localhost:" + port + "/flis/");
HttpURLConnection uc = (HttpURLConnection)url.openConnection();
uc.setDoOutput(true);
uc.setRequestMethod("POST");
uc.setFixedLengthStreamingMode(POST_SIZE);
OutputStream os = uc.getOutputStream();
*/
Socket socket = new Socket("localhost", port);
OutputStream os = socket.getOutputStream();
PrintStream ps = new PrintStream(os);
debug("Request: " + requestHeaders);
ps.print(requestHeaders);
ps.flush();
/* create a 32K byte array with data to POST */
int thirtyTwoK = 32 * 1024;
byte[] ba = new byte[thirtyTwoK];
for (int i =0; i<thirtyTwoK; i++)
ba[i] = (byte)i;
long times = POST_SIZE / thirtyTwoK;
for (int i=0; i<times; i++) {
os.write(ba);
}
/* Uncomment & when CR 6755625 is fixed, remove socket code
os.close();
InputStream is = uc.getInputStream();
while(is.read(ba) != -1);
is.close();
*/
InputStream is = socket.getInputStream();
is.read();
socket.close();
pass();
} finally {
httpServer.stop(0);
}
}
/**
* Http Server
*/
HttpServer startHttpServer() throws IOException {
if (debug) {
Logger logger =
Logger.getLogger("com.sun.net.httpserver");
Handler outHandler = new StreamHandler(System.out,
new SimpleFormatter());
outHandler.setLevel(Level.FINEST);
logger.setLevel(Level.FINEST);
logger.addHandler(outHandler);
}
HttpServer httpServer = HttpServer.create(new InetSocketAddress(0), 0);
httpServer.createContext("/flis/", new MyHandler(POST_SIZE));
httpServer.start();
return httpServer;
}
class MyHandler implements HttpHandler {
static final int BUFFER_SIZE = 32 * 1024;
long expected;
MyHandler(long expected){
this.expected = expected;
}
@Override
public void handle(HttpExchange t) throws IOException {
InputStream is = t.getRequestBody();
byte[] ba = new byte[BUFFER_SIZE];
int read;
long count = 0L;
while((read = is.read(ba)) != -1) {
count += read;
}
is.close();
check(count == expected, "Expected: " + expected + ", received "
+ count);
debug("Received " + count + " bytes");
t.sendResponseHeaders(200, -1);
t.close();
}
}
//--------------------- Infrastructure ---------------------------
boolean debug = true;
volatile int passed = 0, failed = 0;
void pass() {passed++;}
void fail() {failed++; Thread.dumpStack();}
void fail(String msg) {System.err.println(msg); fail();}
void unexpected(Throwable t) {failed++; t.printStackTrace();}
void check(boolean cond) {if (cond) pass(); else fail();}
void check(boolean cond, String failMessage) {if (cond) pass(); else fail(failMessage);}
void debug(String message) {if(debug) { System.out.println(message); } }
public static void main(String[] args) throws Throwable {
Class<?> k = new Object(){}.getClass().getEnclosingClass();
try {k.getMethod("instanceMain",String[].class)
.invoke( k.newInstance(), (Object) args);}
catch (Throwable e) {throw e.getCause();}}
public void instanceMain(String[] args) throws Throwable {
try {test(args);} catch (Throwable t) {unexpected(t);}
System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
if (failed > 0) throw new AssertionError("Some tests failed");}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册