You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2013/03/28 21:39:26 UTC
git commit: WICKET-5123 render url as "." instead of "./."
Updated Branches:
refs/heads/master c70a52a16 -> bf13599b1
WICKET-5123 render url as "." instead of "./."
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/bf13599b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/bf13599b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/bf13599b
Branch: refs/heads/master
Commit: bf13599b1cc55066840a0d821eec583310540f14
Parents: c70a52a
Author: svenmeier <sv...@apache.org>
Authored: Thu Mar 28 21:38:30 2013 +0100
Committer: svenmeier <sv...@apache.org>
Committed: Thu Mar 28 21:38:30 2013 +0100
----------------------------------------------------------------------
.../wicket/request/cycle/UrlRendererTest.java | 21 +++++++++++++-
.../org/apache/wicket/request/UrlRenderer.java | 5 ++-
2 files changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/bf13599b/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
index d7971aa..480d97f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
@@ -149,7 +149,7 @@ public class UrlRendererTest extends Assert
public void test11()
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("a")));
- assertEquals("./.", r1.renderUrl(Url.parse("")));
+ assertEquals(".", r1.renderUrl(Url.parse("")));
}
/**
@@ -470,6 +470,23 @@ public class UrlRendererTest extends Assert
}
/**
+ * https://issues.apache.org/jira/browse/WICKET-5123
+ */
+ @Test
+ public void renderHomeUrl()
+ {
+ Url baseUrl = Url.parse("login");
+
+ MockWebRequest request = new MockWebRequest(baseUrl);
+ UrlRenderer renderer = new UrlRenderer(request);
+
+ Url homeUrl = Url.parse("");
+ String encodedRelativeUrl = renderer.renderUrl(homeUrl);
+
+ assertEquals(".", encodedRelativeUrl);
+ }
+
+ /**
* https://issues.apache.org/jira/browse/WICKET-5065
*/
@Test
@@ -526,7 +543,7 @@ public class UrlRendererTest extends Assert
@Test
public void removeCommonPrefixesWicket5073()
{
- Url baseUrl = new Url(Arrays.asList(""), Arrays.<Url.QueryParameter>asList());
+ Url baseUrl = new Url(Arrays.asList(""), Arrays.<Url.QueryParameter> asList());
MockWebRequest request = new MockWebRequest(baseUrl);
request.setContextPath("/qs");
http://git-wip-us.apache.org/repos/asf/wicket/blob/bf13599b/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java b/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
index affc516..db60c13 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
@@ -283,7 +283,7 @@ public class UrlRenderer
String renderedUrl = new Url(newSegments, url.getQueryParameters()).toString();
// sanitize start
- if (!renderedUrl.startsWith(".."))
+ if (!renderedUrl.startsWith("..") && !renderedUrl.equals("."))
{
// WICKET-4260
renderedUrl = "./" + renderedUrl;
@@ -363,7 +363,8 @@ public class UrlRenderer
{
return true;
}
- if (url.isAbsolute()) {
+ if (url.isAbsolute())
+ {
// do not relativize urls like "/a/b"
return true;
}