You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ct...@apache.org on 2018/10/22 23:35:32 UTC

[47/50] [abbrv] lucene-solr:jira/solr-12746: Remove unnecessary XML exclusions as Jetty handles these by default (janhoy)

Remove unnecessary XML exclusions as Jetty handles these by default (janhoy)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8b483441
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8b483441
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8b483441

Branch: refs/heads/jira/solr-12746
Commit: 8b483441b088c48883073f433a2aede8093d8745
Parents: ebae3f7
Author: Jan Høydahl <ja...@apache.org>
Authored: Thu Oct 18 16:38:52 2018 +0200
Committer: Cassandra Targett <ct...@apache.org>
Committed: Sun Oct 21 15:46:48 2018 -0500

----------------------------------------------------------------------
 solr/server/etc/jetty-ssl.xml | 16 ----------------
 1 file changed, 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8b483441/solr/server/etc/jetty-ssl.xml
----------------------------------------------------------------------
diff --git a/solr/server/etc/jetty-ssl.xml b/solr/server/etc/jetty-ssl.xml
index cdbf57e..9ff5acc 100644
--- a/solr/server/etc/jetty-ssl.xml
+++ b/solr/server/etc/jetty-ssl.xml
@@ -19,22 +19,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        -->