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 2016/09/20 13:19:33 UTC
svn commit: r1761572 -
/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
Author: markt
Date: Tue Sep 20 13:19:33 2016
New Revision: 1761572
URL: http://svn.apache.org/viewvc?rev=1761572&view=rev
Log:
Rename to avoid name conflict with constant
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1761572&r1=1761571&r2=1761572&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Tue Sep 20 13:19:33 2016
@@ -48,7 +48,7 @@ public class SSLHostConfig implements Se
private static final StringManager sm = StringManager.getManager(SSLHostConfig.class);
protected static final String DEFAULT_SSL_HOST_NAME = "_default_";
- protected static final Set<String> SSL_PROTO_ALL = new HashSet<>();
+ protected static final Set<String> SSL_PROTO_ALL_SET = new HashSet<>();
static {
/* Default used if protocols is not configured, also
@@ -57,10 +57,10 @@ public class SSLHostConfig implements Se
value comes from
org.apache.tomcat.util.net.jsse.JSSESocketFactory.defaultServerProtocols
(JSSE) resp. org.apache.tomcat.jni.SSL.SSL_PROTOCOL_ALL (OpenSSL)*/
- SSL_PROTO_ALL.add(Constants.SSL_PROTO_SSLv2Hello);
- SSL_PROTO_ALL.add(Constants.SSL_PROTO_TLSv1);
- SSL_PROTO_ALL.add(Constants.SSL_PROTO_TLSv1_1);
- SSL_PROTO_ALL.add(Constants.SSL_PROTO_TLSv1_2);
+ SSL_PROTO_ALL_SET.add(Constants.SSL_PROTO_SSLv2Hello);
+ SSL_PROTO_ALL_SET.add(Constants.SSL_PROTO_TLSv1);
+ SSL_PROTO_ALL_SET.add(Constants.SSL_PROTO_TLSv1_1);
+ SSL_PROTO_ALL_SET.add(Constants.SSL_PROTO_TLSv1_2);
}
private Type configType = null;
@@ -394,14 +394,14 @@ public class SSLHostConfig implements Se
if (trimmed.charAt(0) == '+') {
trimmed = trimmed.substring(1).trim();
if (trimmed.equalsIgnoreCase(Constants.SSL_PROTO_ALL)) {
- protocols.addAll(SSL_PROTO_ALL);
+ protocols.addAll(SSL_PROTO_ALL_SET);
} else {
protocols.add(trimmed);
}
} else if (trimmed.charAt(0) == '-') {
trimmed = trimmed.substring(1).trim();
if (trimmed.equalsIgnoreCase(Constants.SSL_PROTO_ALL)) {
- protocols.removeAll(SSL_PROTO_ALL);
+ protocols.removeAll(SSL_PROTO_ALL_SET);
} else {
protocols.remove(trimmed);
}
@@ -414,7 +414,7 @@ public class SSLHostConfig implements Se
trimmed, getHostName()));
}
if (trimmed.equalsIgnoreCase(Constants.SSL_PROTO_ALL)) {
- protocols.addAll(SSL_PROTO_ALL);
+ protocols.addAll(SSL_PROTO_ALL_SET);
} else {
protocols.add(trimmed);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org