Author: markt Date: Wed Jun 13 16:04:27 2012 New Revision: 1349939 URL: http://svn.apache.org/viewvc?rev=1349939&view=rev Log: Update APR SSLProtocol defaults and configuration
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1348973 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=1349939&r1=1349938&r2=1349939&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Wed Jun 13 16:04:27 2012 @@ -1176,12 +1176,11 @@ <attribute name="SSLProtocol" required="false"> <p>Protocol which may be used for communicating with clients. The default - value is <code>all</code>, with other acceptable values being <code>SSLv2</code>, - <code>SSLv3</code>, <code>TLSv1</code> and <code>SSLv2+SSLv3</code>. - Starting with version 1.1.21 of the Tomcat native - library any combination of the three protocols concatenated with a - plus sign will be supported. Note that the protocol <code>SSLv2</code> - is inherently unsafe.</p> + value is <code>all</code>, which is equivalent to <code>SSLv3+TLSv1</code> + with other acceptable values being <code>SSLv2</code>, + <code>SSLv3</code>, <code>TLSv1</code> and any combination of the three + protocols concatenated with a plus sign. Note that the protocol + <code>SSLv2</code> is inherently unsafe.</p> </attribute> <attribute name="SSLVerifyClient" required="false"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org