Author: markt
Date: Tue Oct 22 19:36:46 2013
New Revision: 1534751
URL: http://svn.apache.org/r1534751
Log:
Document client side SSL config
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1534727
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=1534751&r1=1534750&r2=1534751&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Oct 22 19:36:46 2013
@@ -92,6 +92,14 @@
</fix>
</changelog>
</subsection>
+ <subsection>
+ <changelog>
+ <add>
+ Add some documentation on the SSL configuration options for WebSocket
+ clients. (markt)
+ </add>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 7.0.47 (violetagg)">
<subsection name="Coyote">
Modified: tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml?rev=1534751&r1=1534750&r2=1534751&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml Tue Oct 22 19:36:46
2013
@@ -84,6 +84,17 @@
<code>org.apache.tomcat.websocket.STRICT_SPEC_COMPLIANCE</code> system
property to <code>true</code> but any explicit setting on the servlet
context
will always take priority.</p>
+
+<p>When using the WebSocket client to connect to secure server endpoints, the
+ client SSL configuration is controlled by the <code>userProperties</code>
+ of the provided <code>javax.websocket.ClientEndpointConfig</code>. The
+ following user properties are supported:</p>
+ <ul>
+ <li><code>org.apache.tomcat.websocket.SSL_PROTOCOLS</code></li>
+ <li><code>org.apache.tomcat.websocket.SSL_TRUSTSTORE</code></li>
+ <li><code>org.apache.tomcat.websocket.SSL_TRUSTSTORE_PWD</code></li>
+ </ul>
+ <p>The default truststore password is <code>changeit</code>.</p>
</section>
<section name="Deprecated proprietary API">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
