On 10/09/2013 15:44, schu...@apache.org wrote: > Author: schultz > Date: Tue Sep 10 14:44:15 2013 > New Revision: 1521514 > > URL: http://svn.apache.org/r1521514 > Log: > Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54691 > > Add configuration property "protocols" alias: "sslEnabledProtocols" > Document the as-yet-undocumented property (only documented > sslEnabledProtocols, to match Tomcat 7/8 documentation). > > Modified: > tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java > tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml > tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
This is Tomcat 6 which is RTC not CTR. There should have been a proposal in the status file with 3 +1 votes before this was applied. Retrospectively, you have my +1. Mark > > 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=1521514&r1=1521513&r2=1521514&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 > Tue Sep 10 14:44:15 2013 > @@ -312,6 +312,7 @@ 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/webapps/docs/changelog.xml > URL: > http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1521514&r1=1521513&r2=1521514&view=diff > ============================================================================== > --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) > +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Sep 10 14:44:15 2013 > @@ -60,6 +60,11 @@ > logging properties without prefixes if the property cannot be found > with > a prefix. (kkolinko) > </fix> > + <fix> > + <bug>54691</bug>: Add "sslEnableProtocols" alias to HTTP connector > + configuration attribute "protocols" and document the configuration > + attribute. (schultz) > + </fix> > </changelog> > </subsection> > <subsection name="Web applications"> > > Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml > URL: > http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml?rev=1521514&r1=1521513&r2=1521514&view=diff > ============================================================================== > --- tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml (original) > +++ tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml Tue Sep 10 14:44:15 2013 > @@ -849,7 +849,21 @@ > timeout. Use 0 to specify an unlimited timeout. If not specified, a > default of 86400 (24 hours) is used.</p> > </attribute> > - > + > + <attribute name="sslEnabledProtocols" required="false"> > + <p>The comma separated list of SSL protocols to support for HTTPS > + connections. If specified, only the protocols that are listed and > + supported by the SSL implementation will be enabled. If not specified, > + the JVM default is used. The permitted values may be obtained from the > + JVM documentation for the allowed values for > + <code>SSLSocket.setEnabledProtocols()</code> e.g. > + <a > href="http://docs.oracle.com/javase/6/docs/technotes/guides/security/StandardNames.html#jssenames";> > + Oracle Java 6</a> and > + <a > href="http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#jssenames";> > + Oracle Java 7</a>. Note: There is overlap between this attribute and > + <code>sslProtocol</code>.</p> > + </attribute> > + > <attribute name="crlFile" required="false"> > <p>The certificate revocation list file to use to validate client > certificates.</p> > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
