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

SPR-7471 - Regression in redirect URL encoding 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3607 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Arjen Poutsma 2010-08-19 08:54:42 +00:00
parent 2578cf21a0
commit 2d3eeeb4ea
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/RedirectView.java
View File

@ -208,13 +208,13 @@ public class RedirectView extends AbstractUrlBasedView {
throws IOException { throws IOException {
String encoding = getEncoding(request); String encoding = getEncoding(request);
// Prepare target URL. // Prepare target URL.
StringBuilder targetUrl = new StringBuilder(); StringBuilder targetUrl = new StringBuilder();
if (this.contextRelative && getUrl().startsWith("/")) { if (this.contextRelative && getUrl().startsWith("/")) {
// Do not apply context path to relative URLs. // Do not apply context path to relative URLs.
targetUrl.append(UriUtils.encodePath(request.getContextPath(), encoding)); targetUrl.append(UriUtils.encodePath(request.getContextPath(), encoding));
targetUrl.append(UriUtils.encodePath(getUrl(), encoding)); targetUrl.append(UriUtils.encodeUri(getUrl(), encoding));
} }
else { else {
targetUrl.append(UriUtils.encodeUri(getUrl(), encoding)); targetUrl.append(UriUtils.encodeUri(getUrl(), encoding));

6
org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java
View File

@ -135,6 +135,12 @@ public class RedirectViewTests {
String expectedUrlForEncoding = "http://url.somewhere.com/test.htm" + "?" + key + "=" + val + "#myAnchor"; String expectedUrlForEncoding = "http://url.somewhere.com/test.htm" + "?" + key + "=" + val + "#myAnchor";
doTest(model, url, false, expectedUrlForEncoding); doTest(model, url, false, expectedUrlForEncoding);
} }
@Test
public void contextRelativeQueryParam() throws Exception {
String url = "/test.html?id=1";
doTest(new HashMap<String, Object>(), url, true, url);
}
@Test @Test
public void twoParams() throws Exception { public void twoParams() throws Exception {