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 f22b2c6 Fix logic error for certificateKeystoreFile="NONE"
f22b2c6 is described below
commit f22b2c61375f9b74bbba86d26798d0c8c0db4f82
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Aug 6 10:55:57 2021 +0200
Fix logic error for certificateKeystoreFile="NONE"
---
java/org/apache/tomcat/util/net/SSLUtilBase.java | 4 ++--
webapps/docs/changelog.xml | 10 ++++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/SSLUtilBase.java
b/java/org/apache/tomcat/util/net/SSLUtilBase.java
index b201201..0cac954 100644
--- a/java/org/apache/tomcat/util/net/SSLUtilBase.java
+++ b/java/org/apache/tomcat/util/net/SSLUtilBase.java
@@ -192,8 +192,8 @@ public abstract class SSLUtilBase implements SSLUtil {
// Some key store types (e.g. hardware) expect the InputStream
// to be null
if(!("PKCS11".equalsIgnoreCase(type) ||
- path.isEmpty()) ||
- "NONE".equalsIgnoreCase(path)) {
+ path.isEmpty() ||
+ "NONE".equalsIgnoreCase(path))) {
istream =
ConfigFileLoader.getSource().getResource(path).getInputStream();
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4482b1e..d6f6bd6 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 9.0.53 (remm)" rtext="in development">
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ Correct a logic error that meant setting
+ <code>certificateKeystoreFile</code> to <code>NONE</code> did not have
+ the expected effect. <code>NONE</code> was incorrectly treated as a
file
+ path. Patch provided by Mikael Sterner. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 9.0.52 (remm)" rtext="in progress">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
