Skip to content

SOLR-17770: Modernize jetty xml files #3377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

SOLR-17770: Modernize jetty xml files #3377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions solr/server/etc/jetty-http.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 5 additions & 0 deletions solr/server/etc/jetty-https.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 7 additions & 0 deletions solr/server/etc/jetty-ssl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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 -->
Expand Down
Loading