From 15c97b753ef32cd4bf000148f9dddbfc89ddab47 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 26 Feb 2018 13:00:38 +0100 Subject: [PATCH] Revised URI building in http.server (consistently use raw attributes) Issue: SPR-16434 --- .../reactive/DefaultServerHttpRequestBuilder.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/DefaultServerHttpRequestBuilder.java b/spring-web/src/main/java/org/springframework/http/server/reactive/DefaultServerHttpRequestBuilder.java index 2bb031b11e..bb2884398a 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/DefaultServerHttpRequestBuilder.java +++ b/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) { 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()); -- GitLab