Align embedded and XML defaults for HttpConfiguration (#12555)

Fix #11947 by aligning embedded and XML HttpConfiguration defaults
jetty · Nov 29, 2024 · 8ca1c05 · 8ca1c05
1 parent d1fc707
commit 8ca1c05
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 13 deletions.
diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty.xml b/jetty-core/jetty-server/src/main/config/etc/jetty.xml
@@ -67,7 +67,7 @@
       <Set name="uriCompliance"><Call class="org.eclipse.jetty.http.UriCompliance" name="from"><Arg><Property name="jetty.httpConfig.uriCompliance" default="DEFAULT"/></Arg></Call></Set>
       <Set name="requestCookieCompliance"><Call class="org.eclipse.jetty.http.CookieCompliance" name="from"><Arg><Property name="jetty.httpConfig.requestCookieCompliance" default="RFC6265"/></Arg></Call></Set>
       <Set name="responseCookieCompliance"><Call class="org.eclipse.jetty.http.CookieCompliance" name="from"><Arg><Property name="jetty.httpConfig.responseCookieCompliance" default="RFC6265"/></Arg></Call></Set>
-      <Set name="relativeRedirectAllowed"><Property name="jetty.httpConfig.relativeRedirectAllowed" default="false"/></Set>
+      <Set name="relativeRedirectAllowed" property="jetty.httpConfig.relativeRedirectAllowed"/>
       <Set name="generateRedirectBody" property="jetty.httpConfig.generateRedirectBody"/>
       <Set name="useInputDirectByteBuffers" property="jetty.httpConfig.useInputDirectByteBuffers"/>
       <Set name="useOutputDirectByteBuffers" property="jetty.httpConfig.useOutputDirectByteBuffers"/>

diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java
@@ -62,8 +62,8 @@ public class DefaultHandler extends Handler.Abstract
     private final long _faviconModifiedMs = (System.currentTimeMillis() / 1000) * 1000L;
     private final HttpField _faviconModified = new PreEncodedHttpField(HttpHeader.LAST_MODIFIED, DateGenerator.formatDate(_faviconModifiedMs));
     private ByteBuffer _favicon;
-    private boolean _serveFavIcon = true;
-    private boolean _showContexts = true;
+    private boolean _serveFavIcon;
+    private boolean _showContexts;
 
     public DefaultHandler()
     {

diff --git a/...est-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/SiweTests.java b/...est-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/SiweTests.java
@@ -11,7 +11,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.ee10.tests.distribution;
+package org.eclipse.jetty.tests.distribution;
 
 import java.io.FileWriter;
 import java.nio.file.Files;
@@ -21,12 +21,11 @@
 
 import org.eclipse.jetty.client.ContentResponse;
 import org.eclipse.jetty.client.FormRequestContent;
-import org.eclipse.jetty.ee10.tests.distribution.siwe.EthereumCredentials;
-import org.eclipse.jetty.ee10.tests.distribution.siwe.SignInWithEthereumGenerator;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.security.siwe.EthereumAuthenticator;
-import org.eclipse.jetty.tests.distribution.AbstractJettyHomeTest;
+import org.eclipse.jetty.tests.distribution.siwe.EthereumCredentials;
+import org.eclipse.jetty.tests.distribution.siwe.SignInWithEthereumGenerator;
 import org.eclipse.jetty.tests.testers.JettyHomeTester;
 import org.eclipse.jetty.tests.testers.Tester;
 import org.eclipse.jetty.util.Fields;
@@ -100,8 +99,7 @@ public void testSiwe() throws Exception
                 client.setFollowRedirects(false);
                 response = client.GET(uri + "/admin");
                 assertThat(response.getStatus(), is(HttpStatus.FOUND_302));
-                assertThat(response.getHeaders().get(HttpHeader.LOCATION),
-                    containsString(uri + "/login.html"));
+                assertThat(response.getHeaders().get(HttpHeader.LOCATION), containsString("/login.html"));
 
                 // Fetch a nonce from the server.
                 response = client.GET(uri + "/auth/nonce");
@@ -112,8 +110,7 @@ public void testSiwe() throws Exception
                 FormRequestContent authRequestContent = getAuthRequestContent(port, nonce);
                 response = client.POST(uri + "/auth/login").body(authRequestContent).send();
                 assertThat(response.getStatus(), is(HttpStatus.SEE_OTHER_303));
-                assertThat(response.getHeaders().get(HttpHeader.LOCATION),
-                    containsString(uri + "/admin"));
+                assertThat(response.getHeaders().get(HttpHeader.LOCATION), containsString("/admin"));
 
                 // We can access /admin as user has the admin role.
                 response = client.GET(uri + "/admin");

diff --git a/...n-common/src/test/java/org/eclipse/jetty/tests/distribution/siwe/EthereumCredentials.java b/...n-common/src/test/java/org/eclipse/jetty/tests/distribution/siwe/EthereumCredentials.java
@@ -11,7 +11,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.ee10.tests.distribution.siwe;
+package org.eclipse.jetty.tests.distribution.siwe;
 
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;

diff --git a/.../src/test/java/org/eclipse/jetty/tests/distribution/siwe/SignInWithEthereumGenerator.java b/.../src/test/java/org/eclipse/jetty/tests/distribution/siwe/SignInWithEthereumGenerator.java
@@ -11,7 +11,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.ee10.tests.distribution.siwe;
+package org.eclipse.jetty.tests.distribution.siwe;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;