This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d2bdd8d94e5a668ff35eaf28b36497d96d449680
Author: Mark Thomas <ma...@apache.org>
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 bca6b2a98d..f6edb59fe6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,16 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 10.1.12 (schultz)" rtext="in development">
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ Correct a regression introduced in 10.1.11 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 10.1.11 (schultz)" rtext="Released 2023-07-10">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
