--- a/jdk/src/share/classes/sun/net/httpserver/Request.java	Mon Mar 09 21:49:56 2009 +0100
+++ b/jdk/src/share/classes/sun/net/httpserver/Request.java	Tue Mar 10 12:28:00 2009 +0100
@@ -52,6 +52,9 @@
         os = rawout;
         do {
             startLine = readLine();
+            if (startLine == null) {
+                return;
+            }
             /* skip blank lines */
         } while (startLine.equals (""));
     }

--- a/jdk/src/share/classes/sun/net/httpserver/ServerImpl.java	Mon Mar 09 21:49:56 2009 +0100
+++ b/jdk/src/share/classes/sun/net/httpserver/ServerImpl.java	Tue Mar 10 12:28:00 2009 +0100
@@ -441,6 +441,7 @@
                         rawin = sslStreams.getInputStream();
                         rawout = sslStreams.getOutputStream();
                         engine = sslStreams.getSSLEngine();
+                        connection.sslStreams = sslStreams;
                     } else {
                         rawin = new BufferedInputStream(
                             new Request.ReadStream (
@@ -450,6 +451,8 @@
                             ServerImpl.this, chan
                         );
                     }
+                    connection.raw = rawin;
+                    connection.rawout = rawout;
                 }
                 Request req = new Request (rawin, rawout);
                 requestLine = req.requestLine();