Fall back on remoteHost if remoteAddress is null

rstoyanchev · rstoyanchev · commit 03c3ec15774c · 2025-10-15T16:42:40.000+01:00
See gh-35589
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
@@ -220,7 +220,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
`@@ -220,7 +220,9 @@ public InetSocketAddress getLocalAddress() {`
`220`	`220`
`221`	`221`	`@Override`
`222`	`222`	`public InetSocketAddress getRemoteAddress() {`
`223`		`- return new InetSocketAddress(this.servletRequest.getRemoteAddr(), this.servletRequest.getRemotePort());`
	`223`	`+ String addressOrHost = this.servletRequest.getRemoteAddr();`
	`224`	`+ addressOrHost = (addressOrHost != null ? addressOrHost : this.servletRequest.getRemoteHost());`
	`225`	`+ return new InetSocketAddress(addressOrHost, this.servletRequest.getRemotePort());`
`224`	`226`	`}`
`225`	`227`
`226`	`228`	`@Override`