From: Joonas Lehtinen <joonas.lehtinen@itmill.com>
Date: Wed, 14 Mar 2007 13:05:36 +0000 (+0000)
Subject: Fixes #519
X-Git-Tag: 6.7.0.beta1~6522
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8b8094b874176c9ebcc626fe52dd480471f1757e;p=vaadin-framework.git

Fixes #519

svn changeset:898/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
index 3974eb98e9..deebaee7c7 100644
--- a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
@@ -1211,7 +1211,10 @@ public class ApplicationServlet extends HttpServlet implements
 		URL applicationUrl;
 		try {
 			URL reqURL = new URL((request.isSecure() ? "https://" : "http://")
-					+ request.getServerName() + ":" + request.getServerPort()
+					+ request.getServerName() + (
+							(request.isSecure() && request.getServerPort() == 443) ||
+							(!request.isSecure() && request.getServerPort() == 80)?"":
+							":" + request.getServerPort())
 					+ request.getRequestURI());
 			String servletPath = request.getContextPath()
 					+ request.getServletPath();