--- a/jdk/src/share/classes/sun/net/www/http/KeepAliveStream.java	Mon Dec 17 10:31:27 2012 -0800
+++ b/jdk/src/share/classes/sun/net/www/http/KeepAliveStream.java	Mon Dec 17 18:39:59 2012 -0800
@@ -83,11 +83,8 @@
             if (expected > count) {
                 long nskip = expected - count;
                 if (nskip <= available()) {
-                    long n = 0;
-                    while (n < nskip) {
-                        nskip = nskip - n;
-                        n = skip(nskip);
-                    }
+                    do {} while ((nskip = (long) (expected - count)) > 0L
+                                 && skip(Math.min(nskip, available())) > 0L);
                 } else if (expected <= KeepAliveStreamCleaner.MAX_DATA_REMAINING && !hurried) {
                     //put this KeepAliveStream on the queue so that the data remaining
                     //on the socket can be cleanup asyncronously.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/net/www/http/KeepAliveStream/InfiniteLoop.java	Mon Dec 17 18:39:59 2012 -0800
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8004863
+ * @summary Checks for proper close code in KeepAliveStream
+ */
+
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+import java.io.*;
+import java.net.*;
+import java.util.concurrent.Phaser;
+
+// Racey test, will not always fail, but if it does then we have a problem.
+
+public class InfiniteLoop {
+
+    public static void main(String[] args) throws Exception {
+        HttpServer server = HttpServer.create(new InetSocketAddress(0), 0);
+        server.createContext("/test/InfiniteLoop", new RespHandler());
+        server.start();
+        try {
+            InetSocketAddress address = server.getAddress();
+            URL url = new URL("http://localhost:" + address.getPort()
+                              + "/test/InfiniteLoop");
+            final Phaser phaser = new Phaser(2);
+            for (int i=0; i<10; i++) {
+                HttpURLConnection uc = (HttpURLConnection)url.openConnection();
+                final InputStream is = uc.getInputStream();
+                final Thread thread = new Thread() {
+                    public void run() {
+                        try {
+                            phaser.arriveAndAwaitAdvance();
+                            while (is.read() != -1)
+                                Thread.sleep(50);
+                        } catch (Exception x) { x.printStackTrace(); }
+                    }};
+                thread.start();
+                phaser.arriveAndAwaitAdvance();
+                is.close();
+                System.out.println("returned from close");
+                thread.join();
+            }
+        } finally {
+            server.stop(0);
+        }
+    }
+
+    static class RespHandler implements HttpHandler {
+        static final int RESP_LENGTH = 32 * 1024;
+        @Override
+        public void handle(HttpExchange t) throws IOException {
+            InputStream is  = t.getRequestBody();
+            byte[] ba = new byte[8192];
+            while(is.read(ba) != -1);
+
+            t.sendResponseHeaders(200, RESP_LENGTH);
+            try (OutputStream os = t.getResponseBody()) {
+                os.write(new byte[RESP_LENGTH]);
+            }
+            t.close();
+        }
+    }
+}