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 973f80af39 Fix use of incorrect constant
973f80af39 is described below
commit 973f80af39dd853f6ae665e2c687b07fa31f4f0a
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Jul 24 09:08:54 2023 +0100
Fix use of incorrect constant
---
java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java | 2 +-
webapps/docs/changelog.xml | 10 ++++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
b/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
index fd92d147e6..ff635bf588 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
@@ -44,7 +44,7 @@ public class SSLHostConfigCertificate implements Serializable
{
static final String DEFAULT_KEYSTORE_PROVIDER =
System.getProperty("javax.net.ssl.keyStoreProvider");
static final String DEFAULT_KEYSTORE_TYPE =
System.getProperty("javax.net.ssl.keyStoreType", "JKS");
private static final String DEFAULT_KEYSTORE_FILE =
- System.getProperty("user.home") + File.pathSeparator + ".keystore";
+ System.getProperty("user.home") + File.separator + ".keystore";
private static final String DEFAULT_KEYSTORE_PASSWORD = "changeit";
// Internal
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 74bdd299ca..43b481afd5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -113,6 +113,16 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ Correct a regression introduced in 8.5.91 and use the correct
+ constant when constructing the default value for the
+ <code>certificateKeystoreFile</code> attribute of an
+ <code>SSLHostConfigCertificate</code> instance. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 8.5.91 (schultz)" rtext="Released 2023-07-10">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
