Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix regression in ReactorServerHttpRequest

Browse Source 
Instead of a backport for cef916, this change simply undoes the
optimization that led to the regression.

Closes gh-30314
This commit is contained in:
rstoyanchev
2023-04-11 15:12:54 +01:00
parent 423f2215c2
commit 1c43a4c7ab
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,10 +79,12 @@ class ReactorServerHttpRequest extends AbstractServerHttpRequest {
return new URI(resolveBaseUrl(request) + resolveRequestUri(request));
}
private static String resolveBaseUrl(HttpServerRequest request) {
private static URI resolveBaseUrl(HttpServerRequest request) throws URISyntaxException {
String scheme = request.scheme();
int port = request.hostPort();
return scheme + "://" + request.hostName() + (usePort(scheme, port) ? ":" + port : "");
return (usePort(scheme, port) ?
new URI(scheme, null, request.hostName(), port, null, null, null) :
new URI(scheme, request.hostName(), null, null));
}
private static boolean usePort(String scheme, int port) {