You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/06/26 16:11:20 UTC
[tomcat] branch master updated (a76a6de -> d018b60)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from a76a6de Align message key format
new d4c1517 Correct comment.
new d018b60 Align with 8.5.x. Also better for sub-classes.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/tomcat/util/net/SSLHostConfig.java | 2 +-
java/org/apache/tomcat/util/net/SSLUtilBase.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Align with 8.5.x. Also better for sub-classes.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d018b60955ccda53d0983b685943a7b01993b05c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 26 17:08:20 2019 +0100
Align with 8.5.x. Also better for sub-classes.
---
java/org/apache/tomcat/util/net/SSLHostConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/SSLHostConfig.java b/java/org/apache/tomcat/util/net/SSLHostConfig.java
index 716ea1b..bdb0c73 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfig.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfig.java
@@ -379,7 +379,7 @@ public class SSLHostConfig implements Serializable {
public LinkedHashSet<Cipher> getCipherList() {
if (cipherList == null) {
- cipherList = OpenSSLCipherConfigurationParser.parse(ciphers);
+ cipherList = OpenSSLCipherConfigurationParser.parse(getCiphers());
}
return cipherList;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Correct comment.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d4c15173ad77c981770314f89a2bf14df952fd36
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 26 17:07:57 2019 +0100
Correct comment.
---
java/org/apache/tomcat/util/net/SSLUtilBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/SSLUtilBase.java b/java/org/apache/tomcat/util/net/SSLUtilBase.java
index d84b532..7adbddd 100644
--- a/java/org/apache/tomcat/util/net/SSLUtilBase.java
+++ b/java/org/apache/tomcat/util/net/SSLUtilBase.java
@@ -202,7 +202,7 @@ public abstract class SSLUtilBase implements SSLUtil {
// Unfortunately, some key stores behave differently with null
// and "".
// JKS key stores treat null and "" interchangeably.
- // PKCS12 key stores (Java 8 onwards) don't return the cert if
+ // PKCS12 key stores (Java 7 onwards) don't return the cert if
// null is used.
// Key stores that do not use passwords expect null
// Therefore:
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org