[java-idp-jetty-base] 01/07: IDP-1609 rebase (by hand) changes against jetty 9.4.28

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to annotated tag 9.4.28.v20200408-jetty-distribution-windows
in repository java-idp-jetty-base.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=6a9e627896abfa28da85d2083d39f510b7f8afc9

commit 6a9e627896abfa28da85d2083d39f510b7f8afc9
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu May 21 15:36:10 2020 +0100

    IDP-1609 rebase (by hand) changes against jetty 9.4.28
    
    https://issues.shibboleth.net/jira/browse/IDP-1609
---
 src/main/resources/jetty-base/etc/jetty-deploy.xml      | 11 ++---------
 src/main/resources/jetty-base/etc/jetty-ssl-context.xml | 12 +++++-------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/main/resources/jetty-base/etc/jetty-deploy.xml b/src/main/resources/jetty-base/etc/jetty-deploy.xml
index 9803202..af24c3f 100644
--- a/src/main/resources/jetty-base/etc/jetty-deploy.xml
+++ b/src/main/resources/jetty-base/etc/jetty-deploy.xml
@@ -1,13 +1,6 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== -->
-<!-- Create the deployment manager                                   -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- The deplyment manager handles the lifecycle of deploying web    -->
-<!-- applications. Apps are provided by instances of the             -->
-<!-- AppProvider interface.                                          -->
-<!-- =============================================================== -->
+<!-- =============================================================== --><!-- Create the deployment manager                                   --><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --><!-- The deplyment manager handles the lifecycle of deploying web    --><!-- applications. Apps are provided by instances of the             --><!-- AppProvider interface.                                          --><!-- ======================================================= [...]
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
   <Call name="addBean">
diff --git a/src/main/resources/jetty-base/etc/jetty-ssl-context.xml b/src/main/resources/jetty-base/etc/jetty-ssl-context.xml
index 2ed0584..70e1a06 100644
--- a/src/main/resources/jetty-base/etc/jetty-ssl-context.xml
+++ b/src/main/resources/jetty-base/etc/jetty-ssl-context.xml
@@ -1,22 +1,19 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- ============================================================= -->
-<!-- SSL ContextFactory configuration                              -->
-<!-- ============================================================= -->
+<!-- ============================================================= --><!-- SSL ContextFactory configuration                              --><!-- ============================================================= -->
 
 <!-- 
   To configure Includes / Excludes for Cipher Suites or Protocols see tweak-ssl.xml example at 
      https://www.eclipse.org/jetty/documentation/current/configuring-ssl.html#configuring-sslcontextfactory-cipherSuites
 -->
 
-<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
+<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory$Server">
   <Set name="Provider"><Property name="jetty.sslContext.provider"/></Set>
   <Set name="KeyStorePath"><Property name="jetty.sslContext.keyStorePath" deprecated="jetty.keystore" default="etc/keystore"/></Set>
   <Set name="KeyStorePassword"><Property name="jetty.sslContext.keyStorePassword" deprecated="jetty.keystore.password" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set>
   <Set name="KeyStoreType"><Property name="jetty.sslContext.keyStoreType" default="JKS"/></Set>
   <Set name="KeyStoreProvider"><Property name="jetty.sslContext.keyStoreProvider"/></Set>
-  <Set name="EndpointIdentificationAlgorithm"></Set>
+  <Set name="EndpointIdentificationAlgorithm"><Property name="jetty.sslContext.endpointIdentificationAlgorithm"/></Set>
   <Set name="NeedClientAuth"><Property name="jetty.sslContext.needClientAuth" deprecated="jetty.ssl.needClientAuth" default="false"/></Set>
   <Set name="WantClientAuth"><Property name="jetty.sslContext.wantClientAuth" deprecated="jetty.ssl.wantClientAuth" default="false"/></Set>
   <Set name="useCipherSuitesOrder"><Property name="jetty.sslContext.useCipherSuitesOrder" default="true"/></Set>
@@ -24,6 +21,7 @@
   <Set name="sslSessionTimeout"><Property name="jetty.sslContext.sslSessionTimeout" default="-1"/></Set>
   <Set name="RenegotiationAllowed"><Property name="jetty.sslContext.renegotiationAllowed" default="true"/></Set>
   <Set name="RenegotiationLimit"><Property name="jetty.sslContext.renegotiationLimit" default="5"/></Set>
+  <Set name="SniRequired"><Property name="jetty.sslContext.sniRequired" default="false"/></Set>
  
   <!-- Example of how to configure a PKIX Certificate Path revocation Checker
   <Call id="pkixPreferCrls" class="java.security.cert.PKIXRevocationChecker$Option" name="valueOf"><Arg>PREFER_CRLS</Arg></Call>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.