Author: markt
Date: Fri Oct 17 13:29:51 2014
New Revision: 1632571
URL: http://svn.apache.org/r1632571
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57102
Ensure the the sslEnabledProtocols option works with both BIO and NIO
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1632571&r1=1632570&r2=1632571&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Oct 17 13:29:51 2014
@@ -102,12 +102,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, markt, remm
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57102
- Ensure the the sslEnabledProtocols option works with both BIO and NIO
- http://people.apache.org/~markt/patches/2014-10-17-bug57102-tc6-v1.patch
- +1: markt, kkolinko, remm
- -1:
-
PATCHES/ISSUES THAT ARE STALLED:
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java?rev=1632571&r1=1632570&r2=1632571&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java Fri
Oct 17 13:29:51 2014
@@ -312,7 +312,6 @@ public class Connector
replacements.put("keystoreType", "keytype");
replacements.put("sslProtocol", "protocol");
replacements.put("sslProtocols", "protocols");
- replacements.put("sslEnabledProtocols", "protocols");
}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1632571&r1=1632570&r2=1632571&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Fri Oct 17 13:29:51 2014
@@ -24,6 +24,7 @@ import java.util.concurrent.ConcurrentHa
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicInteger;
+
import javax.management.MBeanRegistration;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -587,6 +588,16 @@ public class Http11NioProtocol extends A
public boolean getSSLEnabled() { return ep.isSSLEnabled(); }
public void setSSLEnabled(boolean SSLEnabled) {
ep.setSSLEnabled(SSLEnabled); }
+ // Alias for sslEnabledProtocols
+ public void setProtocols(String k) {
+ setSslEnabledProtocols(k);
+ }
+
+ public void setSslEnabledProtocols(String k) {
+ ep.setSslEnabledProtocols(k);
+ }
+
+
/**
* When client certificate information is presented in a form other than
* instances of {@link java.security.cert.X509Certificate} it needs to be
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java?rev=1632571&r1=1632570&r2=1632571&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java Fri
Oct 17 13:29:51 2014
@@ -498,6 +498,15 @@ public class Http11Protocol extends Abst
setAttribute("protocols", k);
}
+ // Alias for protocols
+ public String getSslEnabledProtocols() {
+ return getProtocols();
+ }
+
+ public void setSslEnabledProtocols(String k) {
+ setProtocols(k);
+ }
+
public String getAlgorithm() {
return (String) getAttribute("algorithm");
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1632571&r1=1632570&r2=1632571&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Oct 17 13:29:51 2014
@@ -73,6 +73,10 @@
<bug>56661</bug>: Support using AJP request attribute
<code>AJP_LOCAL_ADDR</code> to fix <code>getLocalAddr()</code>. (rjung)
</fix>
+ <fix>
+ <bug>57102</bug>: Fix bug that meant sslEnabledProtocols setting was
not
+ recognised for the HTTPS NIO connector. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
