Merge branch '6.1.x'

2024-03-26 15:41:46 +01:00
parent f47352ff04 290a41d398
commit 2fea3d7921
88 changed files with 172 additions and 72 deletions
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java
@@ -378,6 +378,7 @@ class DefaultServerRequest implements ServerRequest {
 		}

 		@Override
+		@Nullable
 		public InetSocketAddress host() {
 			return this.httpHeaders.getHost();
 		}