--- a/jdk/src/java.httpclient/share/classes/java/net/http/Stream.java	Fri May 13 09:22:47 2016 +0200
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Stream.java	Fri May 13 11:32:41 2016 -0700
@@ -32,6 +32,9 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.function.BiFunction;
 import java.util.function.LongConsumer;
 
@@ -409,13 +412,20 @@
     @Override
     HttpResponseImpl getResponse() throws IOException {
         try {
-            return getResponseAsync(null).join();
-        } catch (Throwable e) {
+            if (request.timeval() > 0) {
+                return getResponseAsync(null).get(
+                        request.timeval(), TimeUnit.MILLISECONDS);
+            } else {
+                return getResponseAsync(null).join();
+            }
+        } catch (TimeoutException e) {
+            throw new HttpTimeoutException("Response timed out");
+        } catch (InterruptedException | ExecutionException e) {
             Throwable t = e.getCause();
             if (t instanceof IOException) {
                 throw (IOException)t;
             }
-            throw e;
+            throw new IOException(e);
         }
     }
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/net/httpclient/http2/Timeout.java	Fri May 13 11:32:41 2016 -0700
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2016, 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.
+ */
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpTimeoutException;
+import java.util.concurrent.TimeUnit;
+import javax.net.ssl.SSLServerSocket;
+import javax.net.ssl.SSLServerSocketFactory;
+import javax.net.ssl.SSLSocket;
+
+/*
+ * @test
+ * @bug 8156710
+ * @summary Check if HttpTimeoutException is thrown if a server doesn't reply
+ * @run main/othervm Timeout
+ */
+public class Timeout {
+
+    private static final int RANDOM_PORT = 0;
+    private static final int TIMEOUT = 3 * 1000; // in millis
+    private static final String KEYSTORE = System.getProperty("test.src")
+            + File.separator + "keystore.p12";
+    private static final String PASSWORD = "password";
+
+    // indicates if server is ready to accept connections
+    private static volatile boolean ready = false;
+
+    public static void main(String[] args) throws Exception {
+        System.setProperty("javax.net.ssl.keyStore", KEYSTORE);
+        System.setProperty("javax.net.ssl.keyStorePassword", PASSWORD);
+        System.setProperty("javax.net.ssl.trustStore", KEYSTORE);
+        System.setProperty("javax.net.ssl.trustStorePassword", PASSWORD);
+
+        SSLServerSocketFactory factory =
+                (SSLServerSocketFactory) SSLServerSocketFactory.getDefault();
+
+        try (SSLServerSocket ssocket =
+                (SSLServerSocket) factory.createServerSocket(RANDOM_PORT)) {
+
+            // start server
+            Thread server = new Thread(() -> {
+                while (true) {
+                    System.out.println("server: ready");
+                    ready = true;
+                    try (SSLSocket socket = (SSLSocket) ssocket.accept()) {
+
+                        // just read forever
+                        System.out.println("server: accepted");
+                        while (true) {
+                            socket.getInputStream().read();
+                        }
+                    } catch (IOException e) {
+                        // ignore exceptions on server side
+                        System.out.println("server: exception: " + e);
+                    }
+                }
+            });
+            server.setDaemon(true);
+            server.start();
+
+            // wait for server is ready
+            do {
+                Thread.sleep(1000);
+            } while (!ready);
+
+            String uri = "https://localhost:" + ssocket.getLocalPort();
+            connect(uri);
+        }
+    }
+
+    private static void connect(String server) throws Exception {
+        try {
+            HttpClient.create()
+                    .version(HttpClient.Version.HTTP_2)
+                    .build()
+                    .request(new URI(server))
+                    .timeout(TimeUnit.MILLISECONDS, TIMEOUT)
+                    .body(HttpRequest.fromString("body"))
+                    .GET()
+                    .response()
+                    .body(HttpResponse.asString());
+
+            throw new RuntimeException("unexpected successful connection");
+        } catch (HttpTimeoutException e) {
+            System.out.println("expected exception: " + e);
+        }
+    }
+
+}

Binary file jdk/test/java/net/httpclient/http2/keystore.p12 has changed