Updated Branches: refs/heads/wicket-1.5.x 3152da4f3 -> 8c6c9e052
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/8c6c9e05 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8c6c9e05 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8c6c9e05 Branch: refs/heads/wicket-1.5.x Commit: 8c6c9e05256efb63c01531531b8172f39a491db7 Parents: 3152da4 Author: svenmeier <[email protected]> Authored: Mon Oct 1 10:13:20 2012 +0200 Committer: svenmeier <[email protected]> Committed: Mon Oct 1 10:13:20 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/8c6c9e05/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 5c5519e..b54b5df 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 @@ -222,32 +222,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/8c6c9e05/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 c3fc07e..8fdb211 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
