Merge branch '3.5.x'

Closes gh-47036

Author: wilkinsona

module/spring-boot-web-server/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java

@@ -20,6 +20,7 @@
 import java.util.Collections;
 import java.util.Map;
 
+import org.apache.coyote.http11.Http11Nio2Protocol;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.context.properties.bind.Bindable;
@@ -140,6 +141,12 @@ void testCustomizeMaxHttpRequestHeaderSizeUseBytesByDefault() {
 		assertThat(this.properties.getMaxHttpRequestHeaderSize()).isEqualTo(DataSize.ofKilobytes(1));
 	}
 
+	@Test
+	void defaultMaxHttpRequestHeaderSizeMatchesTomcatsDefault() {
+		assertThat(this.properties.getMaxHttpRequestHeaderSize().toBytes())
+			.isEqualTo(new Http11Nio2Protocol().getMaxHttpRequestHeaderSize());
+	}
+
 	private void bind(String name, String value) {
 		bind(Collections.singletonMap(name, value));
 	}