tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1682062 - /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Date Wed, 27 May 2015 15:46:21 GMT
Author: rjung
Date: Wed May 27 15:46:20 2015
New Revision: 1682062

URL: http://svn.apache.org/r1682062
Log:
Fix merge error.

Modified:
    tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1682062&r1=1682061&r2=1682062&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Wed May 27 15:46:20
2015
@@ -560,7 +560,7 @@ public class AprEndpoint extends Abstrac
                         value |= SSL.SSL_PROTOCOL_TLSV1;
                     } else if (Constants.SSL_PROTO_TLSv1_1.equalsIgnoreCase(protocol)) {
                         value |= SSL.SSL_PROTOCOL_TLSV1_1;
-                    } else if (Constants.SSL_PROTO_TLSv1_1.equalsIgnoreCase(protocol)) {
+                    } else if (Constants.SSL_PROTO_TLSv1_2.equalsIgnoreCase(protocol)) {
                         value |= SSL.SSL_PROTOCOL_TLSV1_2;
                     } else {
                         // Protocol not recognized, fail to start as it is safer than



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message