From b6f9ff848a1d8b758dde2dd07e749321a419a9ee Mon Sep 17 00:00:00 2001
From: maximesinclair <maxime.sinclair@gmail.com>
Date: Wed, 14 May 2014 23:49:51 +0200
Subject: [PATCH] [BUGFIX#8] Broken url generated in HTTPS context

---
 src/main/webapp/index.jsp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
index f633033..62560fa 100644
--- a/src/main/webapp/index.jsp
+++ b/src/main/webapp/index.jsp
@@ -3,10 +3,11 @@
 
 <c:set var="cfg" value="${applicationScope['cfg']}" />
 <c:set var="contextroot" value="${pageContext.request.contextPath}" />
-<c:set var="hostpath" value="http://${pageContext.request.serverName}:${pageContext.request.serverPort}${contextroot}" />
-<c:if test="${pageContext.request.serverPort == 80 }">
-    <c:set var="hostpath" value="http://${pageContext.request.serverName}${contextroot}" />
+<c:if test="${(pageContext.request.scheme == 'http' && pageContext.request.serverPort != 80) ||
+        (pageContext.request.scheme == 'https' && pageContext.request.serverPort != 443) }">
+    <c:set var="port" value=":${pageContext.request.serverPort}" />
 </c:if>
+<c:set var="hostpath" value="${pageContext.request.scheme}://${pageContext.request.serverName}${port}${contextroot}" />
 <c:if test="${!empty encoded}">
     <c:set var="imgurl" value="${hostpath}/png/${encoded}" />
     <c:set var="svgurl" value="${hostpath}/svg/${encoded}" />