Skip to content

Commit 05823a1

Browse files
SOLR-17770: Modernize jetty xml files (#3377)
1 parent bc137a3 commit 05823a1

File tree

4 files changed

+28
-0
lines changed

4 files changed

+28
-0
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc
2+
title: Modernize Jetty xml files
3+
type: other # added, changed, fixed, deprecated, removed, dependency_update, security, other
4+
authors:
5+
- name: Houston Putman
6+
nick: HoustonPutman
7+
url: https://home.apache.org/phonebook.html?uid=houston
8+
links:
9+
- name: SOLR-17770
10+
url: https://issues.apache.org/jira/browse/SOLR-17770
11+

solr/server/etc/jetty-http.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@
4343
<Set name="idleTimeout"><Property name="solr.jetty.http.idleTimeout" default="120000"/></Set>
4444
<Set name="acceptorPriorityDelta"><Property name="solr.jetty.http.acceptorPriorityDelta" default="0"/></Set>
4545
<Set name="acceptQueueSize"><Property name="solr.jetty.http.acceptQueueSize" default="0"/></Set>
46+
<Set name="reuseAddress"><Property name="solr.jetty.http.reuseAddress" default="true"/></Set>
47+
<Set name="reusePort"><Property name="solr.jetty.http.reusePort" default="false"/></Set>
48+
<Set name="acceptedTcpNoDelay"><Property name="solr.jetty.http.acceptedTcpNoDelay" default="true"/></Set>
49+
<Set name="acceptedReceiveBufferSize" property="solr.jetty.http.acceptedReceiveBufferSize" />
50+
<Set name="acceptedSendBufferSize" property="solr.jetty.http.acceptedSendBufferSize" />
4651
</New>
4752
</Arg>
4853
</Call>

solr/server/etc/jetty-https.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@
6868
<Set name="idleTimeout"><Property name="solr.jetty.https.timeout" default="120000"/></Set>
6969
<Set name="acceptorPriorityDelta"><Property name="solr.jetty.ssl.acceptorPriorityDelta" default="0"/></Set>
7070
<Set name="acceptQueueSize"><Property name="solr.jetty.https.acceptQueueSize" default="0"/></Set>
71+
<Set name="reuseAddress"><Property name="solr.jetty.ssl.reuseAddress" default="true"/></Set>
72+
<Set name="reusePort"><Property name="solr.jetty.ssl.reusePort" default="false"/></Set>
73+
<Set name="acceptedTcpNoDelay"><Property name="solr.jetty.ssl.acceptedTcpNoDelay" default="true"/></Set>
74+
<Set name="acceptedReceiveBufferSize" property="solr.jetty.ssl.acceptedReceiveBufferSize" />
75+
<Set name="acceptedSendBufferSize" property="solr.jetty.ssl.acceptedSendBufferSize" />
7176
</New>
7277
</Arg>
7378
</Call>

solr/server/etc/jetty-ssl.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<!-- and either jetty-https.xml or jetty-spdy.xml (but not both) -->
88
<!-- ============================================================= -->
99
<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory$Server">
10+
<Set name="Provider" property="solr.jetty.ssl.provider" />
1011
<Call class="org.apache.solr.util.configuration.SSLConfigurationsFactory" name="current">
1112
<Call name="init" />
1213
</Call>
@@ -23,6 +24,12 @@
2324
<Set name="KeyStoreType"><Property name="solr.jetty.keystore.type" default="PKCS12"/></Set>
2425
<Set name="TrustStoreType"><Property name="solr.jetty.truststore.type" default="PKCS12"/></Set>
2526
<Set name="EndpointIdentificationAlgorithm"><Property name="solr.jetty.ssl.verifyClientHostName"/></Set>
27+
<Set name="useCipherSuitesOrder" property="solr.jetty.ssl.useCipherSuitesOrder" />
28+
<Set name="sslSessionCacheSize" property="solr.jetty.ssl.sslSessionCacheSize" />
29+
<Set name="sslSessionTimeout" property="solr.jetty.ssl.sslSessionTimeout" />
30+
<Set name="RenegotiationAllowed" property="solr.jetty.ssl.renegotiationAllowed" />
31+
<Set name="RenegotiationLimit" property="solr.jetty.ssl.renegotiationLimit" />
32+
<Set name="SniRequired"><Property name="solr.jetty.ssl.sniRequired" default="false"/></Set>
2633

2734
<!-- =========================================================== -->
2835
<!-- Create a TLS specific HttpConfiguration based on the -->

0 commit comments

Comments
 (0)