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

SPR-7471 - Regression in redirect URL encoding

Browse Source
This commit is contained in:
Arjen Poutsma
2010-08-19 08:54:42 +00:00
parent 061b2c91a0
commit 001d676dec
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,7 +214,7 @@ public class RedirectView extends AbstractUrlBasedView {
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

@@ -136,6 +136,12 @@ public class RedirectViewTests {
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 {
String url = "http://url.somewhere.com"; String url = "http://url.somewhere.com";