This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new e179752441 Fix use of incorrect constant
e179752441 is described below
commit e1797524419cdb0acf6c7fc688af550adc8ab2ed
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 | 6 ++++++
2 files changed, 7 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 3402841497..166b05ca7f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -132,6 +132,12 @@
Refactor waiting for an HTTP/2 stream or connection window update to
handle spurious wake-ups during the wait. (markt)
</fix>
+ <fix>
+ Correct a regression introduced in 9.0.78 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>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
