From 0663261c38000c787620275ab857661adc336a38 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Tue, 17 May 2022 16:44:03 +1000
Subject: [PATCH] Issue #1771 - changes from review

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 .../main/config/etc/jetty-secure-redirect.xml    | 16 +++-------------
 jetty-server/src/main/config/etc/jetty.xml       |  2 +-
 .../src/main/config/modules/secure-redirect.mod  |  2 +-
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/jetty-server/src/main/config/etc/jetty-secure-redirect.xml b/jetty-server/src/main/config/etc/jetty-secure-redirect.xml
index 3e2d14aca73f..b834c2f0c851 100644
--- a/jetty-server/src/main/config/etc/jetty-secure-redirect.xml
+++ b/jetty-server/src/main/config/etc/jetty-secure-redirect.xml
@@ -2,20 +2,10 @@
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
-  <Get id="Handler" name="handler"/>
-  <Call name="setHandler">
+  <Call name="insertHandler">
     <Arg>
-      <New class="org.eclipse.jetty.server.handler.HandlerList">
-        <Call name="addHandler">
-          <Arg>
-            <New id="SecuredRedirectHandler" class="org.eclipse.jetty.server.handler.SecuredRedirectHandler">
-              <Arg type="int"><Property name="jetty.redirect.code" default="302"/></Arg>
-            </New>
-          </Arg>
-        </Call>
-        <Call name="addHandler">
-          <Arg><Ref refid="Handler"/></Arg>
-        </Call>
+      <New id="SecuredRedirectHandler" class="org.eclipse.jetty.server.handler.SecuredRedirectHandler">
+        <Arg type="int"><Property name="jetty.secureredirect.code" default="302"/></Arg>
       </New>
     </Arg>
   </Call>
diff --git a/jetty-server/src/main/config/etc/jetty.xml b/jetty-server/src/main/config/etc/jetty.xml
index 423c63b04488..b2d16df274c0 100644
--- a/jetty-server/src/main/config/etc/jetty.xml
+++ b/jetty-server/src/main/config/etc/jetty.xml
@@ -60,7 +60,7 @@
     <!-- =========================================================== -->
     <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
       <Set name="secureScheme" property="jetty.httpConfig.secureScheme"/>
-      <Set name="securePort"><Property name="jetty.httpConfig.securePort" default="8443"/></Set>
+      <Set name="securePort" property="jetty.httpConfig.securePort"/>
       <Set name="outputBufferSize" property="jetty.httpConfig.outputBufferSize"/>
       <Set name="outputAggregationSize" property="jetty.httpConfig.outputAggregationSize"/>
       <Set name="requestHeaderSize" property="jetty.httpConfig.requestHeaderSize"/>
diff --git a/jetty-server/src/main/config/modules/secure-redirect.mod b/jetty-server/src/main/config/modules/secure-redirect.mod
index 6a300b862506..fd845099fe87 100644
--- a/jetty-server/src/main/config/modules/secure-redirect.mod
+++ b/jetty-server/src/main/config/modules/secure-redirect.mod
@@ -14,4 +14,4 @@ etc/jetty-secure-redirect.xml
 
 [ini-template]
 ## The redirect code to use in the response.
-# jetty.redirect.code=302
+# jetty.secureredirect.code=302