# HG changeset patch # User apetcher # Date 1528309789 14400 # Node ID 89bfd8e0ff19d86e8eb5e61d4e6ac7f866a53c92 # Parent cf2370de8673a73a81b2b5066f4edc787b6bd1bf setting HTTP client default TLS version back to 1.2 only diff -r cf2370de8673 -r 89bfd8e0ff19 src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java --- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java Wed Jun 06 09:39:14 2018 -0700 +++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java Wed Jun 06 14:29:49 2018 -0400 @@ -298,7 +298,7 @@ private static SSLParameters getDefaultParams(SSLContext ctx) { SSLParameters params = ctx.getSupportedSSLParameters(); - params.setProtocols(new String[]{"TLSv1.2", "TLSv1.3"}); + params.setProtocols(new String[]{"TLSv1.2"}); return params; } diff -r cf2370de8673 -r 89bfd8e0ff19 test/jdk/java/net/httpclient/http2/TLSConnection.java --- a/test/jdk/java/net/httpclient/http2/TLSConnection.java Wed Jun 06 09:39:14 2018 -0700 +++ b/test/jdk/java/net/httpclient/http2/TLSConnection.java Wed Jun 06 14:29:49 2018 -0400 @@ -92,7 +92,7 @@ "---\nTest #2: default SSL parameters, " + "expect successful connection", () -> connect(uriString, USE_DEFAULT_SSL_PARAMETERS)); - success &= checkProtocol(handler.getSSLSession(), "TLSv1.3"); + success &= checkProtocol(handler.getSSLSession(), "TLSv1.2"); // set SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA cipher suite // which has less priority in default cipher suite list