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

Avoid double encoding URI in ServletServerHttpRequest

Browse Source 
Issue: SPR-13876
This commit is contained in:
Sammy Chu
2016-01-19 12:53:22 +08:00
committed by Rossen Stoyanchev
parent a5f4aa6824
commit 5185953f29
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
View File

@@ -88,9 +88,12 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
@Override
public URI getURI() {
try {
return new URI(this.servletRequest.getScheme(), null, this.servletRequest.getServerName(),
this.servletRequest.getServerPort(), this.servletRequest.getRequestURI(),
this.servletRequest.getQueryString(), null);
StringBuffer url = this.servletRequest.getRequestURL();
String queryStr = this.servletRequest.getQueryString();
if (StringUtils.hasText(queryStr)) {
url.append('?').append(queryStr);
}
return new URI(url.toString());
}
catch (URISyntaxException ex) {
throw new IllegalStateException("Could not get HttpServletRequest URI: " + ex.getMessage(), ex);