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 3974eb98e9d963c6f449ca92f203bdac44f3e451..deebaee7c7a6f26f3d97b1a1456d26d5fa0d1fcb 100644 (file)
--- 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();