Return-Path: X-Original-To: apmail-wicket-commits-archive@www.apache.org Delivered-To: apmail-wicket-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 567AB10099 for ; Mon, 1 Jul 2013 07:14:34 +0000 (UTC) Received: (qmail 52827 invoked by uid 500); 1 Jul 2013 07:14:33 -0000 Delivered-To: apmail-wicket-commits-archive@wicket.apache.org Received: (qmail 52754 invoked by uid 500); 1 Jul 2013 07:14:32 -0000 Mailing-List: contact commits-help@wicket.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@wicket.apache.org Delivered-To: mailing list commits@wicket.apache.org Received: (qmail 52743 invoked by uid 99); 1 Jul 2013 07:14:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jul 2013 07:14:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0A6234520C; Mon, 1 Jul 2013 07:14:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mgrigorov@apache.org To: commits@wicket.apache.org Message-Id: <0976d4f50b4a43f89e47ba49ad78adb7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: WICKET-5260 UrlRenderer#renderUrl() doesn't preserve the host Date: Mon, 1 Jul 2013 07:14:32 +0000 (UTC) Updated Branches: refs/heads/wicket-6.x 807f063a5 -> f4784c2a5 WICKET-5260 UrlRenderer#renderUrl() doesn't preserve the host Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f4784c2a Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f4784c2a Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f4784c2a Branch: refs/heads/wicket-6.x Commit: f4784c2a5abac0ffdac6d8455909a090b7190c13 Parents: 807f063 Author: Martin Tzvetanov Grigorov Authored: Mon Jul 1 10:13:35 2013 +0300 Committer: Martin Tzvetanov Grigorov Committed: Mon Jul 1 10:14:08 2013 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/request/UrlRenderer.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/f4784c2a/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 566833e..4ed6397 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,7 @@ public class UrlRenderer { String relativeUrl = renderRelativeUrl(url); Url relative = Url.parse(relativeUrl, url.getCharset()); + relative.setHost(url.getHost()); relative.setPort(url.getPort()); relative.setProtocol(url.getProtocol()); renderedUrl = renderFullUrl(relative);