diff options
| author | Joonas Lehtinen <joonas.lehtinen@itmill.com> | 2007-03-14 13:05:36 +0000 |
|---|---|---|
| committer | Joonas Lehtinen <joonas.lehtinen@itmill.com> | 2007-03-14 13:05:36 +0000 |
| commit | 8b8094b874176c9ebcc626fe52dd480471f1757e (patch) | |
| tree | bbad66686659709c8d2b8dc3036a78df728828ee /src/com/itmill/toolkit/terminal/web/ApplicationServlet.java | |
| parent | a9be93ca7723e300108434d68172a0077050090d (diff) | |
| download | vaadin-framework-8b8094b874176c9ebcc626fe52dd480471f1757e.tar.gz vaadin-framework-8b8094b874176c9ebcc626fe52dd480471f1757e.zip | |
Fixes #519
svn changeset:898/svn branch:trunk
Diffstat (limited to 'src/com/itmill/toolkit/terminal/web/ApplicationServlet.java')
| -rw-r--r-- | src/com/itmill/toolkit/terminal/web/ApplicationServlet.java | 5 |
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(); |