aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/itmill/toolkit/terminal/web/ApplicationServlet.java5
1 files changed, 4 insertions, 1 deletions
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();