Author: markt Date: Tue Oct 22 18:45:46 2013 New Revision: 1534727 URL: http://svn.apache.org/r1534727 Log: Document client side SSL config
Modified: tomcat/trunk/webapps/docs/web-socket-howto.xml Modified: tomcat/trunk/webapps/docs/web-socket-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/web-socket-howto.xml?rev=1534727&r1=1534726&r2=1534727&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/web-socket-howto.xml (original) +++ tomcat/trunk/webapps/docs/web-socket-howto.xml Tue Oct 22 18:45:46 2013 @@ -81,6 +81,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> </body> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org