You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2019/03/26 09:04:10 UTC

[lucene-solr] branch branch_6_6 updated: Remove unnecessary XML exclusions as Jetty handles these by default (janhoy)

This is an automated email from the ASF dual-hosted git repository.

janhoy pushed a commit to branch branch_6_6
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_6_6 by this push:
     new 961c84f  Remove unnecessary XML exclusions as Jetty handles these by default (janhoy)
961c84f is described below

commit 961c84f6c2538be547dd508855bb452871089eb8
Author: Jan Høydahl <ja...@apache.org>
AuthorDate: Thu Oct 18 16:38:52 2018 +0200

    Remove unnecessary XML exclusions as Jetty handles these by default (janhoy)
    
    (cherry picked from commit a3fc31e5d2657182a590525c4ebc607a586698f3)
---
 solr/server/etc/jetty-ssl.xml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/solr/server/etc/jetty-ssl.xml b/solr/server/etc/jetty-ssl.xml
index 4d85de6..218ebee 100644
--- a/solr/server/etc/jetty-ssl.xml
+++ b/solr/server/etc/jetty-ssl.xml
@@ -15,22 +15,6 @@
   <Set name="WantClientAuth"><Property name="solr.jetty.ssl.wantClientAuth" default="false"/></Set>
   <Set name="KeyStoreType"><Property name="solr.jetty.keystore.type" default="JKS"/></Set>
   <Set name="TrustStoreType"><Property name="solr.jetty.truststore.type" default="JKS"/></Set>
-  <Set name="excludeProtocols">
-    <Array type="java.lang.String">
-      <Item>SSLv3</Item>
-    </Array>
-  </Set>
-  <Set name="ExcludeCipherSuites">
-    <Array type="String">
-      <Item>SSL_RSA_WITH_DES_CBC_SHA</Item>
-      <Item>SSL_DHE_RSA_WITH_DES_CBC_SHA</Item>
-      <Item>SSL_DHE_DSS_WITH_DES_CBC_SHA</Item>
-      <Item>SSL_RSA_EXPORT_WITH_RC4_40_MD5</Item>
-      <Item>SSL_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
-      <Item>SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
-      <Item>SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA</Item>
-    </Array>
-  </Set>
 
   <!-- =========================================================== -->
   <!-- Create a TLS specific HttpConfiguration based on the        -->