This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new cafbb85 Ensure tests pass with newer versions of Java 8
cafbb85 is described below
commit cafbb85dd716b14114e264cb4587347fb64a1886
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Aug 12 19:52:35 2020 +0100
Ensure tests pass with newer versions of Java 8
---
test/org/apache/tomcat/util/net/TesterSupport.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java
b/test/org/apache/tomcat/util/net/TesterSupport.java
index 2b14955..13b08ab 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -200,7 +200,12 @@ public final class TesterSupport {
protected static void configureClientSsl(String protocol) {
try {
System.setProperty("https.protocols", protocol);
- SSLContext sc = SSLContext.getInstance(Constants.SSL_PROTO_TLS);
+ SSLContext sc;
+ if (TesterSupport.TLSV13_AVAILABLE) {
+ sc = SSLContext.getInstance("TLSv1.3");
+ } else {
+ sc = SSLContext.getInstance(Constants.SSL_PROTO_TLS);
+ }
sc.init(TesterSupport.getUser1KeyManagers(),
TesterSupport.getTrustManagers(),
null);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
