Author: schultz
Date: Mon Sep 16 15:24:42 2013
New Revision: 1523701
URL: http://svn.apache.org/r1523701
Log:
Updated documentation for sslProtocol to include a note about
sslEnabledProtocols.
Modified:
tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
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=1523701&r1=1523700&r2=1523701&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml Mon Sep 16 15:24:42 2013
@@ -775,9 +775,17 @@
</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>
- </attribute>
+ <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 obtained 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="ciphers" required="false">
<p>The comma separated list of encryption ciphers that this socket is
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
