Merge branch '6.2.x'

This commit is contained in:
rstoyanchev
2025-10-15 16:43:06 +01:00
@@ -216,7 +216,9 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
@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