--- java/org/apache/tomcat/websocket/WsWebSocketContainer.java (revision 1779202) +++ java/org/apache/tomcat/websocket/WsWebSocketContainer.java (working copy) @@ -81,6 +81,8 @@ */ public static final String SSL_PROTOCOLS_PROPERTY = "org.apache.tomcat.websocket.SSL_PROTOCOLS"; + public static final String SSL_CIPHER_SUITES_PROPERTY = + "org.apache.tomcat.websocket.SSL_CIPHER_SUITES"; public static final String SSL_TRUSTSTORE_PROPERTY = "org.apache.tomcat.websocket.SSL_TRUSTSTORE"; public static final String SSL_TRUSTSTORE_PWD_PROPERTY = @@ -864,6 +866,12 @@ engine.setEnabledProtocols(sslProtocolsValue.split(",")); } + String sslCipherSuitesValue = + (String) userProperties.get(SSL_CIPHER_SUITES_PROPERTY); + if (sslCipherSuitesValue != null) { + engine.setEnabledCipherSuites(sslCipherSuitesValue.split(",")); + } + engine.setUseClientMode(true); return engine; --- webapps/docs/web-socket-howto.xml (revision 1779202) +++ webapps/docs/web-socket-howto.xml (working copy) @@ -144,6 +144,7 @@