Apache Solr open-source search software
SOLR-16735: Allow custom configuration of Jetty's SecureRequestCustomizer (#1547)
Tomas Eduardo Fernandez Lobbebb9fe5c8b619
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex ced2d58539e..1d6b5b39c2e 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -137,6 +137,8 @@ Other Changes* SOLR-15703: replace all SolrException.log usage in Solr to just call log.error(...) directly (Kevin Risden)+* SOLR-16735: Allow custom configuration of Jetty's SecureRequestCustomizer (Tomás Fernández Löbbe)+================== 9.2.0 ==================New Featuresdiff --git a/solr/server/etc/jetty-ssl.xml b/solr/server/etc/jetty-ssl.xmlindex dda2f14e3ee..878f9386720 100644--- a/solr/server/etc/jetty-ssl.xml+++ b/solr/server/etc/jetty-ssl.xml@@ -32,7 +32,14 @@<New id="sslHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration"><Arg><Ref refid="httpConfig"/></Arg><Call name="addCustomizer">- <Arg><New class="org.eclipse.jetty.server.SecureRequestCustomizer"/></Arg>+ <Arg>+ <New class="org.eclipse.jetty.server.SecureRequestCustomizer">+ <Arg name="sniRequired" type="boolean"><Property name="solr.jetty.ssl.sniRequired" default="false"/></Arg>+ <Arg name="sniHostCheck" type="boolean"><Property name="solr.jetty.ssl.sniHostCheck" default="true"/></Arg>+ <Arg name="stsMaxAgeSeconds" type="int"><Property name="solr.jetty.ssl.stsMaxAgeSeconds" default="-1"/></Arg>+ <Arg name="stsIncludeSubdomains" type="boolean"><Property name="solr.jetty.ssl.stsIncludeSubdomains" default="false"/></Arg>+ </New>+ </Arg></Call></New>