Browse Source

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

Issue: SPR-16434
pull/1706/head
Juergen Hoeller 8 years ago
parent
commit
15c97b753e
  1. 10
      spring-web/src/main/java/org/springframework/http/server/reactive/DefaultServerHttpRequestBuilder.java

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

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

Loading…
Cancel
Save