Merge branch '2.6.x' into 2.7.x

Closes gh-31329
spring-projects · Jun 10, 2022 · 7f584a9 · 7f584a9
2 parents 29cd148 + e02803d
commit 7f584a9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/...org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java b/...org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java
@@ -280,6 +280,11 @@ private void customizeMaxHttpHeaderSize(ConfigurableTomcatWebServerFactory facto
 			if (handler instanceof AbstractHttp11Protocol) {
 				AbstractHttp11Protocol protocol = (AbstractHttp11Protocol) handler;
 				protocol.setMaxHttpHeaderSize(maxHttpHeaderSize);
+				for (UpgradeProtocol upgradeProtocol : protocol.findUpgradeProtocols()) {
+					if (upgradeProtocol instanceof Http2Protocol) {
+						((Http2Protocol) upgradeProtocol).setMaxHeaderSize(maxHttpHeaderSize);
+					}
+				}
 			}
 		});
 	}

diff --git a/...pringframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java b/...pringframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java
@@ -182,6 +182,19 @@ void customMaxHttpHeaderSize() {
 						.getMaxHttpHeaderSize()).isEqualTo(DataSize.ofKilobytes(1).toBytes()));
 	}
 
+	@Test
+	void customMaxHttpHeaderSizeWithHttp2() {
+		bind("server.max-http-header-size=1KB", "server.http2.enabled=true");
+		customizeAndRunServer((server) -> {
+			AbstractHttp11Protocol<?> protocolHandler = (AbstractHttp11Protocol<?>) server.getTomcat().getConnector()
+					.getProtocolHandler();
+			long expectedSize = DataSize.ofKilobytes(1).toBytes();
+			assertThat(protocolHandler.getMaxHttpHeaderSize()).isEqualTo(expectedSize);
+			assertThat(((Http2Protocol) protocolHandler.getUpgradeProtocol("h2c")).getMaxHeaderSize())
+					.isEqualTo(expectedSize);
+		});
+	}
+
 	@Test
 	void customMaxHttpHeaderSizeIgnoredIfNegative() {
 		bind("server.max-http-header-size=-1");