root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Revised URI building in http.server (consistently use raw attributes) 

Issue: SPR-16434
This commit is contained in:
Juergen Hoeller 2018-02-26 13:00:38 +01:00
parent c6f5acf15d
commit 15c97b753e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-web/src/main/java/org/springframework/http/server/reactive/DefaultServerHttpRequestBuilder.java
View File

@ -143,10 +143,10 @@ class DefaultServerHttpRequestBuilder implements ServerHttpRequest.Builder {
if (this.uri.getScheme() != null) {
uriBuilder.append(this.uri.getScheme()).append(':');
}
if (this.uri.getUserInfo() != null || this.uri.getHost() != null) {
if (this.uri.getRawUserInfo() != null || this.uri.getHost() != null) {
uriBuilder.append("//");
if (this.uri.getUserInfo() != null) {
uriBuilder.append(this.uri.getUserInfo()).append('@');
if (this.uri.getRawUserInfo() != null) {
uriBuilder.append(this.uri.getRawUserInfo()).append('@');
}
if (this.uri.getHost() != null) {
uriBuilder.append(this.uri.getHost());
@ -161,8 +161,8 @@ class DefaultServerHttpRequestBuilder implements ServerHttpRequest.Builder {
if (this.uri.getRawQuery() != null) {
uriBuilder.append('?').append(this.uri.getRawQuery());
}
if (this.uri.getFragment() != null) {
uriBuilder.append('#').append(this.uri.getFragment());
if (this.uri.getRawFragment() != null) {
uriBuilder.append('#').append(this.uri.getRawFragment());
}
try {
return new URI(uriBuilder.toString());