From 088ef836c1431022255ffa4a1d5a631701d01f30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Tue, 19 Aug 2025 15:04:58 +0200 Subject: [PATCH] Polish "Upgrade to Jetty 12.1.0" See https://github.com/jetty/jetty.project/issues/13483 See gh-46906 --- .../autoconfigure/JettyServerProperties.java | 2 +- .../JettyWebServerFactoryCustomizerTests.java | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/JettyServerProperties.java b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/JettyServerProperties.java index 90ed851ef65..b00c90d87b3 100644 --- a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/JettyServerProperties.java +++ b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/JettyServerProperties.java @@ -73,7 +73,7 @@ public class JettyServerProperties { /** * Maximum size of the HTTP response header. */ - private DataSize maxHttpResponseHeaderSize = DataSize.ofKilobytes(8); + private DataSize maxHttpResponseHeaderSize = DataSize.ofKilobytes(16); /** * Maximum number of connections that the server accepts and processes at any given diff --git a/module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/JettyWebServerFactoryCustomizerTests.java b/module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/JettyWebServerFactoryCustomizerTests.java index 1a8bd0f81dc..411fe247109 100644 --- a/module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/JettyWebServerFactoryCustomizerTests.java +++ b/module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/JettyWebServerFactoryCustomizerTests.java @@ -288,15 +288,15 @@ class JettyWebServerFactoryCustomizerTests { @Test void defaultMaxHttpResponseHeaderSize() { JettyWebServer server = customizeAndGetServer(); - List responseHeaderSizes = getResponseHeaderSizes(server); - assertThat(responseHeaderSizes).containsOnly(8192); + List responseHeaderSizes = getMaxResponseHeaderSizes(server); + assertThat(responseHeaderSizes).containsOnly(16384); } @Test void customizeMaxHttpResponseHeaderSize() { bind("server.jetty.max-http-response-header-size=2KB"); JettyWebServer server = customizeAndGetServer(); - List responseHeaderSizes = getResponseHeaderSizes(server); + List responseHeaderSizes = getMaxResponseHeaderSizes(server); assertThat(responseHeaderSizes).containsOnly(2048); } @@ -304,16 +304,16 @@ class JettyWebServerFactoryCustomizerTests { void customMaxHttpResponseHeaderSizeIgnoredIfNegative() { bind("server.jetty.max-http-response-header-size=-1"); JettyWebServer server = customizeAndGetServer(); - List responseHeaderSizes = getResponseHeaderSizes(server); - assertThat(responseHeaderSizes).containsOnly(8192); + List responseHeaderSizes = getMaxResponseHeaderSizes(server); + assertThat(responseHeaderSizes).containsOnly(16384); } @Test void customMaxHttpResponseHeaderSizeIgnoredIfZero() { bind("server.jetty.max-http-response-header-size=0"); JettyWebServer server = customizeAndGetServer(); - List responseHeaderSizes = getResponseHeaderSizes(server); - assertThat(responseHeaderSizes).containsOnly(8192); + List responseHeaderSizes = getMaxResponseHeaderSizes(server); + assertThat(responseHeaderSizes).containsOnly(16384); } @Test @@ -351,8 +351,8 @@ class JettyWebServerFactoryCustomizerTests { return getHeaderSizes(server, HttpConfiguration::getRequestHeaderSize); } - private List getResponseHeaderSizes(JettyWebServer server) { - return getHeaderSizes(server, HttpConfiguration::getResponseHeaderSize); + private List getMaxResponseHeaderSizes(JettyWebServer server) { + return getHeaderSizes(server, HttpConfiguration::getMaxResponseHeaderSize); } private List getHeaderSizes(JettyWebServer server, Function provider) {