View | Details | Raw Unified | Return to bug 60597
Collapse All | Expand All

(-)java/org/apache/tomcat/websocket/WsWebSocketContainer.java (+8 lines)
Lines 81-86 Link Here
81
     */
81
     */
82
    public static final String SSL_PROTOCOLS_PROPERTY =
82
    public static final String SSL_PROTOCOLS_PROPERTY =
83
            "org.apache.tomcat.websocket.SSL_PROTOCOLS";
83
            "org.apache.tomcat.websocket.SSL_PROTOCOLS";
84
    public static final String SSL_CIPHER_SUITES_PROPERTY =
85
            "org.apache.tomcat.websocket.SSL_CIPHER_SUITES";
84
    public static final String SSL_TRUSTSTORE_PROPERTY =
86
    public static final String SSL_TRUSTSTORE_PROPERTY =
85
            "org.apache.tomcat.websocket.SSL_TRUSTSTORE";
87
            "org.apache.tomcat.websocket.SSL_TRUSTSTORE";
86
    public static final String SSL_TRUSTSTORE_PWD_PROPERTY =
88
    public static final String SSL_TRUSTSTORE_PWD_PROPERTY =
Lines 864-869 Link Here
864
                engine.setEnabledProtocols(sslProtocolsValue.split(","));
866
                engine.setEnabledProtocols(sslProtocolsValue.split(","));
865
            }
867
            }
866
868
869
            String sslCipherSuitesValue =
870
                    (String) userProperties.get(SSL_CIPHER_SUITES_PROPERTY);
871
            if (sslCipherSuitesValue != null) {
872
                engine.setEnabledCipherSuites(sslCipherSuitesValue.split(","));
873
            }
874
867
            engine.setUseClientMode(true);
875
            engine.setUseClientMode(true);
868
876
869
            return engine;
877
            return engine;
(-)webapps/docs/web-socket-howto.xml (+1 lines)
Lines 144-149 Link Here
144
   <ul>
144
   <ul>
145
     <li><code>org.apache.tomcat.websocket.SSL_CONTEXT</code></li>
145
     <li><code>org.apache.tomcat.websocket.SSL_CONTEXT</code></li>
146
     <li><code>org.apache.tomcat.websocket.SSL_PROTOCOLS</code></li>
146
     <li><code>org.apache.tomcat.websocket.SSL_PROTOCOLS</code></li>
147
     <li><code>org.apache.tomcat.websocket.SSL_CIPHER_SUITES</code></li>
147
     <li><code>org.apache.tomcat.websocket.SSL_TRUSTSTORE</code></li>
148
     <li><code>org.apache.tomcat.websocket.SSL_TRUSTSTORE</code></li>
148
     <li><code>org.apache.tomcat.websocket.SSL_TRUSTSTORE_PWD</code></li>
149
     <li><code>org.apache.tomcat.websocket.SSL_TRUSTSTORE_PWD</code></li>
149
   </ul>
150
   </ul>

Return to bug 60597