Apache Solr open-source search software
SOLR-17770: Modernize jetty xml files (#3377)
Houston Putman05823a17ac3c
diff --git a/changelog/unreleased/update-jetty-xmls.yml b/changelog/unreleased/update-jetty-xmls.ymlnew file mode 100644index 00000000000..aadd4ab3f9d--- /dev/null+++ b/changelog/unreleased/update-jetty-xmls.yml@@ -0,0 +1,11 @@+# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc+title: Modernize Jetty xml files+type: other # added, changed, fixed, deprecated, removed, dependency_update, security, other+authors:+ - name: Houston Putman+ nick: HoustonPutman+ url: https://home.apache.org/phonebook.html?uid=houston+links:+- name: SOLR-17770+ url: https://issues.apache.org/jira/browse/SOLR-17770+diff --git a/solr/server/etc/jetty-http.xml b/solr/server/etc/jetty-http.xmlindex aeb273e2c0c..02f53991c5c 100644--- a/solr/server/etc/jetty-http.xml+++ b/solr/server/etc/jetty-http.xml@@ -43,6 +43,11 @@<Set name="idleTimeout"><Property name="solr.jetty.http.idleTimeout" default="120000"/></Set><Set name="acceptorPriorityDelta"><Property name="solr.jetty.http.acceptorPriorityDelta" default="0"/></Set><Set name="acceptQueueSize"><Property name="solr.jetty.http.acceptQueueSize" default="0"/></Set>+ <Set name="reuseAddress"><Property name="solr.jetty.http.reuseAddress" default="true"/></Set>+ <Set name="reusePort"><Property name="solr.jetty.http.reusePort" default="false"/></Set>+ <Set name="acceptedTcpNoDelay"><Property name="solr.jetty.http.acceptedTcpNoDelay" default="true"/></Set>+ <Set name="acceptedReceiveBufferSize" property="solr.jetty.http.acceptedReceiveBufferSize" />+ <Set name="acceptedSendBufferSize" property="solr.jetty.http.acceptedSendBufferSize" /></New></Arg></Call>diff --git a/solr/server/etc/jetty-https.xml b/solr/server/etc/jetty-https.xmlindex 3f7f1e301d2..4a74eb12506 100644--- a/solr/server/etc/jetty-https.xml+++ b/solr/server/etc/jetty-https.xml@@ -68,6 +68,11 @@<Set name="idleTimeout"><Property name="solr.jetty.https.timeout" default="120000"/></Set><Set name="acceptorPriorityDelta"><Property name="solr.jetty.ssl.acceptorPriorityDelta" default="0"/></Set><Set name="acceptQueueSize"><Property name="solr.jetty.https.acceptQueueSize" default="0"/></Set>+ <Set name="reuseAddress"><Property name="solr.jetty.ssl.reuseAddress" default="true"/></Set>+ <Set name="reusePort"><Property name="solr.jetty.ssl.reusePort" default="false"/></Set>+ <Set name="acceptedTcpNoDelay"><Property name="solr.jetty.ssl.acceptedTcpNoDelay" default="true"/></Set>+ <Set name="acceptedReceiveBufferSize" property="solr.jetty.ssl.acceptedReceiveBufferSize" />+ <Set name="acceptedSendBufferSize" property="solr.jetty.ssl.acceptedSendBufferSize" /></New></Arg></Call>diff --git a/solr/server/etc/jetty-ssl.xml b/solr/server/etc/jetty-ssl.xmlindex 90cbc13c257..240cf302127 100644--- a/solr/server/etc/jetty-ssl.xml+++ b/solr/server/etc/jetty-ssl.xml@@ -7,6 +7,7 @@<!-- and either jetty-https.xml or jetty-spdy.xml (but not both) --><!-- ============================================================= --><Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory$Server">+ <Set name="Provider" property="solr.jetty.ssl.provider" /><Call class="org.apache.solr.util.configuration.SSLConfigurationsFactory" name="current"><Call name="init" /></Call>@@ -23,6 +24,12 @@<Set name="KeyStoreType"><Property name="solr.jetty.keystore.type" default="PKCS12"/></Set><Set name="TrustStoreType"><Property name="solr.jetty.truststore.type" default="PKCS12"/></Set><Set name="EndpointIdentificationAlgorithm"><Property name="solr.jetty.ssl.verifyClientHostName"/></Set>+ <Set name="useCipherSuitesOrder" property="solr.jetty.ssl.useCipherSuitesOrder" />+ <Set name="sslSessionCacheSize" property="solr.jetty.ssl.sslSessionCacheSize" />+ <Set name="sslSessionTimeout" property="solr.jetty.ssl.sslSessionTimeout" />+ <Set name="RenegotiationAllowed" property="solr.jetty.ssl.renegotiationAllowed" />+ <Set name="RenegotiationLimit" property="solr.jetty.ssl.renegotiationLimit" />+ <Set name="SniRequired"><Property name="solr.jetty.ssl.sniRequired" default="false"/></Set><!-- =========================================================== --><!-- Create a TLS specific HttpConfiguration based on the -->