Skip to content

Commit 1c43a4c

Browse files
committed
Fix regression in ReactorServerHttpRequest
Instead of a backport for cef916, this change simply undoes the optimization that led to the regression. Closes gh-30314
1 parent 423f221 commit 1c43a4c

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,12 @@ private static URI initUri(HttpServerRequest request) throws URISyntaxException
7979
return new URI(resolveBaseUrl(request) + resolveRequestUri(request));
8080
}
8181

82-
private static String resolveBaseUrl(HttpServerRequest request) {
82+
private static URI resolveBaseUrl(HttpServerRequest request) throws URISyntaxException {
8383
String scheme = request.scheme();
8484
int port = request.hostPort();
85-
return scheme + "://" + request.hostName() + (usePort(scheme, port) ? ":" + port : "");
85+
return (usePort(scheme, port) ?
86+
new URI(scheme, null, request.hostName(), port, null, null, null) :
87+
new URI(scheme, request.hostName(), null, null));
8688
}
8789

8890
private static boolean usePort(String scheme, int port) {

0 commit comments

Comments
 (0)