--- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java Wed Jul 04 16:54:56 2018 +0200
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java Wed Jul 04 16:16:24 2018 +0100
@@ -329,7 +329,18 @@
private static SSLParameters getDefaultParams(SSLContext ctx) {
SSLParameters params = ctx.getSupportedSSLParameters();
- params.setProtocols(new String[]{"TLSv1.2"});
+ String[] protocols = params.getProtocols();
+ boolean found13 = false;
+ for (String proto : protocols) {
+ if (proto.equals("TLSv1.3")) {
+ found13 = true;
+ break;
+ }
+ }
+ if (found13)
+ params.setProtocols(new String[] {"TLSv1.3", "TLSv1.2"});
+ else
+ params.setProtocols(new String[] {"TLSv1.2"});
return params;
}