Author: markt
Date: Wed Jan 13 11:26:39 2010
New Revision: 898722
URL: http://svn.apache.org/viewvc?rev=898722&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48532
Better documentation of the SSL connector defaults
Modified:
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
tomcat/tc5.5.x/trunk/container/webapps/docs/config/http.xml
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=898722&r1=898721&r2=898722&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Jan 13
11:26:39 2010
@@ -177,6 +177,11 @@
the Manager How-To in the documentation webapp. Based on a patch by
Arnaud Espy. (markt)
</add>
+ <add>
+ <bug>48532</bug>: Add information to the BIO/NIO SSL configuration page
+ in the documentation web application to specify how the defaults for
the
+ various trust store attributes are determined. (markt)
+ </add>
</changelog>
</subsection>
</section>
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/config/http.xml?rev=898722&r1=898721&r2=898722&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/config/http.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/config/http.xml Wed Jan 13
11:26:39 2010
@@ -480,18 +480,26 @@
</attribute>
<attribute name="truststoreFile" required="false">
- <p>The TrustStore file to use to validate client certificates.</p>
+ <p>The trust store file to use to validate client certificates. The
+ default is the value of the <code>javax.net.ssl.trustStore</code> system
+ property. If neither this attribute nor the default system property is
+ set, no trust store will be configured.</p>
</attribute>
<attribute name="truststorePass" required="false">
- <p>The password to access the TrustStore. This defaults to the value
- of <code>keystorePass</code>.</p>
+ <p>The password to access the trust store. The default is the value of
the
+ <code>javax.net.ssl.trustStorePassword</code> system property. If that
+ property is null, the value of <code>keystorePass</code> is used as the
+ default. If neither this attribute, the default system property nor
+ <code>keystorePass</code>is set, no trust store will be configured.</p>
</attribute>
<attribute name="truststoreType" required="false">
- <p>Add this element if your are using a different format for the
- TrustStore then you are using for the KeyStore.</p>
- </attribute>
+ <p>The type of key store used for the trust store. The default is the
+ value of the <code>javax.net.ssl.trustStoreType</code> system property.
If
+ that property is null, the value of <code>keystoreType</code> is used as
+ the default.</p>
+ </attribute>
<attribute name="allowUnsafeLegacyRenegotiation" required="false">
<p>Is unsafe legacy TLS renegotiation allowed which is likely to expose
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
