Author: markt
Date: Wed Jan 9 16:01:11 2013
New Revision: 1430923
URL: http://svn.apache.org/viewvc?rev=1430923&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54244
Clarify documentation for BIO/NIO SSL config attributes sslEnabledProtocols and
sslProtocol
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1430921
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1430923&r1=1430922&r2=1430923&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jan 9 16:01:11 2013
@@ -180,6 +180,16 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Web applications">
+ <changelog>
+ <fix>
+ <bug>54244</bug>: Clarify the documentation for the BIO and NIO SSL
+ configuration attributes <code>sslEnabledProtocols</code> and
+ <code>sslProtocol</code> within the documentation web application.
+ (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<fix>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1430923&r1=1430922&r2=1430923&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Wed Jan 9 16:01:11 2013
@@ -1018,8 +1018,16 @@
</attribute>
<attribute name="sslEnabledProtocols" required="false">
- <p>The list of SSL protocols to use. If not specified, the JVM default is
- used.</p>
+ <p>The comma separated list of SSL protocols to support for HTTPS
+ connections. If specified, only the protocols listed will be supported.
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="sslImplementationName" required="false">
@@ -1030,8 +1038,16 @@
</attribute>
<attribute name="sslProtocol" required="false">
- <p>The version of the SSL protocol to use. If not specified,
- the default is "<code>TLS</code>".</p>
+ <p>The the SSL protocol(s) to use (a single value may enable multiple
+ protocols - see the JVM documentation for details). If not specified, the
+ default is <code>TLS</code>. The permitted values may be obainted from
the
+ JVM documentation for the allowed values for algorithm when creating an
+ <code>SSLContext</code> instance e.g.
+ <a
href="http://docs.oracle.com/javase/6/docs/technotes/guides/security/StandardNames.html#SSLContext";>
+ Oracle Java 6</a> and
+ <a
href="http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#SSLContext";>
+ Oracle Java 7</a>.Note: There is overlap between this attribute and
+ <code>sslEnabledProtocols</code>.</p>
</attribute>
<attribute name="trustManagerClassName" required="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
