Skip to content

Commit 088ef83

Browse files
committed
Polish "Upgrade to Jetty 12.1.0"
See jetty/jetty.project#13483 See gh-46906
1 parent 4a8dc3e commit 088ef83

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/JettyServerProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public class JettyServerProperties {
7373
/**
7474
* Maximum size of the HTTP response header.
7575
*/
76-
private DataSize maxHttpResponseHeaderSize = DataSize.ofKilobytes(8);
76+
private DataSize maxHttpResponseHeaderSize = DataSize.ofKilobytes(16);
7777

7878
/**
7979
* Maximum number of connections that the server accepts and processes at any given

module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/JettyWebServerFactoryCustomizerTests.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -288,32 +288,32 @@ void customMaxHttpRequestHeaderSizeIgnoredIfZero() {
288288
@Test
289289
void defaultMaxHttpResponseHeaderSize() {
290290
JettyWebServer server = customizeAndGetServer();
291-
List<Integer> responseHeaderSizes = getResponseHeaderSizes(server);
292-
assertThat(responseHeaderSizes).containsOnly(8192);
291+
List<Integer> responseHeaderSizes = getMaxResponseHeaderSizes(server);
292+
assertThat(responseHeaderSizes).containsOnly(16384);
293293
}
294294

295295
@Test
296296
void customizeMaxHttpResponseHeaderSize() {
297297
bind("server.jetty.max-http-response-header-size=2KB");
298298
JettyWebServer server = customizeAndGetServer();
299-
List<Integer> responseHeaderSizes = getResponseHeaderSizes(server);
299+
List<Integer> responseHeaderSizes = getMaxResponseHeaderSizes(server);
300300
assertThat(responseHeaderSizes).containsOnly(2048);
301301
}
302302

303303
@Test
304304
void customMaxHttpResponseHeaderSizeIgnoredIfNegative() {
305305
bind("server.jetty.max-http-response-header-size=-1");
306306
JettyWebServer server = customizeAndGetServer();
307-
List<Integer> responseHeaderSizes = getResponseHeaderSizes(server);
308-
assertThat(responseHeaderSizes).containsOnly(8192);
307+
List<Integer> responseHeaderSizes = getMaxResponseHeaderSizes(server);
308+
assertThat(responseHeaderSizes).containsOnly(16384);
309309
}
310310

311311
@Test
312312
void customMaxHttpResponseHeaderSizeIgnoredIfZero() {
313313
bind("server.jetty.max-http-response-header-size=0");
314314
JettyWebServer server = customizeAndGetServer();
315-
List<Integer> responseHeaderSizes = getResponseHeaderSizes(server);
316-
assertThat(responseHeaderSizes).containsOnly(8192);
315+
List<Integer> responseHeaderSizes = getMaxResponseHeaderSizes(server);
316+
assertThat(responseHeaderSizes).containsOnly(16384);
317317
}
318318

319319
@Test
@@ -351,8 +351,8 @@ private List<Integer> getRequestHeaderSizes(JettyWebServer server) {
351351
return getHeaderSizes(server, HttpConfiguration::getRequestHeaderSize);
352352
}
353353

354-
private List<Integer> getResponseHeaderSizes(JettyWebServer server) {
355-
return getHeaderSizes(server, HttpConfiguration::getResponseHeaderSize);
354+
private List<Integer> getMaxResponseHeaderSizes(JettyWebServer server) {
355+
return getHeaderSizes(server, HttpConfiguration::getMaxResponseHeaderSize);
356356
}
357357

358358
private List<Integer> getHeaderSizes(JettyWebServer server, Function<HttpConfiguration, Integer> provider) {

0 commit comments

Comments
 (0)