This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new f24dfd956d Fix Jre8Compat regression that caused TLS issues
f24dfd956d is described below
commit f24dfd956dcaa94b75ac2536afedc781ba6058be
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Jun 8 17:37:59 2022 +0100
Fix Jre8Compat regression that caused TLS issues
---
java/org/apache/tomcat/util/compat/JreCompat.java | 5 +++++
webapps/docs/changelog.xml | 9 +++++++++
2 files changed, 14 insertions(+)
diff --git a/java/org/apache/tomcat/util/compat/JreCompat.java
b/java/org/apache/tomcat/util/compat/JreCompat.java
index 487f1093ef..6780664285 100644
--- a/java/org/apache/tomcat/util/compat/JreCompat.java
+++ b/java/org/apache/tomcat/util/compat/JreCompat.java
@@ -64,6 +64,11 @@ public class JreCompat {
jre19Available = false;
jre9Available = true;
jre8Available = true;
+ } else if (Jre8Compat.isSupported()) {
+ instance = new Jre8Compat();
+ jre19Available = false;
+ jre9Available = false;
+ jre8Available = true;
} else {
instance = new JreCompat();
jre19Available = false;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 324ca29177..293cc81339 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,15 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 8.5.81 (schultz)" rtext="in development">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Correct a regression in the 8.5.80 (not released) that broken or
+ unexpectedly modified some TLS configurations when running on a Java 8
+ JDK. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 8.5.80 (schultz)" rtext="release in progress">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
