提交 a5a87f52 编写于 作者: A alanb

Merge

...@@ -31,6 +31,7 @@ import java.nio.channels.*; ...@@ -31,6 +31,7 @@ import java.nio.channels.*;
import java.net.*; import java.net.*;
import javax.net.ssl.*; import javax.net.ssl.*;
import java.util.*; import java.util.*;
import java.util.logging.Logger;
import java.text.*; import java.text.*;
import sun.net.www.MessageHeader; import sun.net.www.MessageHeader;
import com.sun.net.httpserver.*; import com.sun.net.httpserver.*;
...@@ -204,6 +205,21 @@ class ExchangeImpl { ...@@ -204,6 +205,21 @@ class ExchangeImpl {
tmpout.write (bytes(statusLine, 0), 0, statusLine.length()); tmpout.write (bytes(statusLine, 0), 0, statusLine.length());
boolean noContentToSend = false; // assume there is content boolean noContentToSend = false; // assume there is content
rspHdrs.set ("Date", df.format (new Date())); rspHdrs.set ("Date", df.format (new Date()));
/* check for response type that is not allowed to send a body */
if ((rCode>=100 && rCode <200) /* informational */
||(rCode == 204) /* no content */
||(rCode == 304)) /* not modified */
{
if (contentLen != -1) {
Logger logger = server.getLogger();
String msg = "sendResponseHeaders: rCode = "+ rCode
+ ": forcing contentLen = -1";
logger.warning (msg);
}
contentLen = -1;
}
if (contentLen == 0) { if (contentLen == 0) {
if (http10) { if (http10) {
o.setWrappedStream (new UndefLengthOutputStream (this, ros)); o.setWrappedStream (new UndefLengthOutputStream (this, ros));
......
...@@ -1180,6 +1180,10 @@ public class HttpURLConnection extends java.net.HttpURLConnection { ...@@ -1180,6 +1180,10 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
inputStream = http.getInputStream(); inputStream = http.getInputStream();
respCode = getResponseCode(); respCode = getResponseCode();
if (respCode == -1) {
disconnectInternal();
throw new IOException ("Invalid Http response");
}
if (respCode == HTTP_PROXY_AUTH) { if (respCode == HTTP_PROXY_AUTH) {
if (streaming()) { if (streaming()) {
disconnectInternal(); disconnectInternal();
......
/*
* Copyright 2009 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 6886436
* @summary
*/
import com.sun.net.httpserver.*;
import java.util.*;
import java.util.concurrent.*;
import java.util.logging.*;
import java.io.*;
import java.net.*;
public class B6886436 {
public static void main (String[] args) throws Exception {
Logger logger = Logger.getLogger ("com.sun.net.httpserver");
ConsoleHandler c = new ConsoleHandler();
c.setLevel (Level.WARNING);
logger.addHandler (c);
logger.setLevel (Level.WARNING);
Handler handler = new Handler();
InetSocketAddress addr = new InetSocketAddress (0);
HttpServer server = HttpServer.create (addr, 0);
HttpContext ctx = server.createContext ("/test", handler);
ExecutorService executor = Executors.newCachedThreadPool();
server.setExecutor (executor);
server.start ();
URL url = new URL ("http://localhost:"+server.getAddress().getPort()+"/test/foo.html");
HttpURLConnection urlc = (HttpURLConnection)url.openConnection ();
try {
InputStream is = urlc.getInputStream();
while (is.read()!= -1) ;
is.close ();
urlc = (HttpURLConnection)url.openConnection ();
urlc.setReadTimeout (3000);
is = urlc.getInputStream();
while (is.read()!= -1);
is.close ();
} catch (IOException e) {
server.stop(2);
executor.shutdown();
throw new RuntimeException ("Test failed");
}
server.stop(2);
executor.shutdown();
System.out.println ("OK");
}
public static boolean error = false;
static class Handler implements HttpHandler {
int invocation = 1;
public void handle (HttpExchange t)
throws IOException
{
InputStream is = t.getRequestBody();
Headers map = t.getRequestHeaders();
Headers rmap = t.getResponseHeaders();
while (is.read () != -1) ;
is.close();
// send a 204 response with an empty chunked body
t.sendResponseHeaders (204, 0);
t.close();
}
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册