提交 15c97b75 编写于 作者: J Juergen Hoeller

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

Issue: SPR-16434
上级 c6f5acf1
......@@ -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());
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册