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 2012/10/01 10:23:39 UTC
git commit: WICKET-4776 rendering full url has to keep port and
protocol in intermediate url
Updated Branches:
refs/heads/master 3965e85ca -> 9ffee0027
WICKET-4776 rendering full url has to keep port and protocol in intermediate url
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9ffee002
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9ffee002
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9ffee002
Branch: refs/heads/master
Commit: 9ffee00273b1a03767522ccf7a5c6c2dadd4fa14
Parents: 3965e85
Author: svenmeier <sv...@apache.org>
Authored: Mon Oct 1 10:04:53 2012 +0200
Committer: svenmeier <sv...@apache.org>
Committed: Mon Oct 1 10:04:53 2012 +0200
----------------------------------------------------------------------
.../wicket/request/cycle/UrlRendererTest.java | 12 ++++++------
.../org/apache/wicket/request/UrlRenderer.java | 2 ++
2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/9ffee002/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 a4f953a..1f3cc56 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
@@ -235,32 +235,32 @@ public class UrlRendererTest extends Assert
Url newUrl = Url.parse("four");
newUrl.setProtocol("https");
String fullUrl = renderer.renderUrl(newUrl);
- assertEquals("http://www.example.com:8888/four", fullUrl);
+ assertEquals("https://www.example.com:8888/four", fullUrl);
newUrl = Url.parse("./four");
newUrl.setProtocol("https");
fullUrl = renderer.renderUrl(newUrl);
- assertEquals("http://www.example.com:8888/four", fullUrl);
+ assertEquals("https://www.example.com:8888/four", fullUrl);
newUrl = Url.parse("./././four");
newUrl.setProtocol("https");
fullUrl = renderer.renderUrl(newUrl);
- assertEquals("http://www.example.com:8888/four", fullUrl);
+ assertEquals("https://www.example.com:8888/four", fullUrl);
newUrl = Url.parse("../four");
newUrl.setProtocol("https");
fullUrl = renderer.renderUrl(newUrl);
- assertEquals("http://www.example.com:8888/four", fullUrl);
+ assertEquals("https://www.example.com:8888/four", fullUrl);
newUrl = Url.parse(".././four");
newUrl.setProtocol("https");
fullUrl = renderer.renderUrl(newUrl);
- assertEquals("http://www.example.com:8888/four", fullUrl);
+ assertEquals("https://www.example.com:8888/four", fullUrl);
newUrl = Url.parse("../../../../four");
newUrl.setProtocol("https");
fullUrl = renderer.renderUrl(newUrl);
- assertEquals("http://www.example.com:8888/four", fullUrl);
+ assertEquals("https://www.example.com:8888/four", fullUrl);
}
@Test
http://git-wip-us.apache.org/repos/asf/wicket/blob/9ffee002/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 c9cac95..028dd01 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
@@ -103,6 +103,8 @@ public class UrlRenderer
{
String relativeUrl = renderRelativeUrl(url);
Url relative = Url.parse(relativeUrl, url.getCharset());
+ relative.setPort(url.getPort());
+ relative.setProtocol(url.getProtocol());
renderedUrl = renderFullUrl(relative);
}
else