Merge branch '6.2.x'

rstoyanchev · rstoyanchev · commit b9d6a9022003 · 2025-10-15T16:43:06.000+01:00
diff --git a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
@@ -216,7 +216,9 @@ public InetSocketAddress getLocalAddress() {
 
 	@Override
 	public InetSocketAddress getRemoteAddress() {
-		return new InetSocketAddress(this.servletRequest.getRemoteAddr(), this.servletRequest.getRemotePort());
+		String addressOrHost = this.servletRequest.getRemoteAddr();
+		addressOrHost = (addressOrHost != null ? addressOrHost : this.servletRequest.getRemoteHost());
+		return new InetSocketAddress(addressOrHost, this.servletRequest.getRemotePort());
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,9 @@ public InetSocketAddress getLocalAddress() {`
`216`	`216`
`217`	`217`	`@Override`
`218`	`218`	`public InetSocketAddress getRemoteAddress() {`
`219`		`- return new InetSocketAddress(this.servletRequest.getRemoteAddr(), this.servletRequest.getRemotePort());`
	`219`	`+ String addressOrHost = this.servletRequest.getRemoteAddr();`
	`220`	`+ addressOrHost = (addressOrHost != null ? addressOrHost : this.servletRequest.getRemoteHost());`
	`221`	`+ return new InetSocketAddress(addressOrHost, this.servletRequest.getRemotePort());`
`220`	`222`	`}`
`221`	`223`
`222`	`224`	`@Override`