1
0
mirror of https://github.com/octoleo/plantuml-server.git synced 2024-12-23 01:08:54 +00:00

[BUGFIX#8] Broken url generated in HTTPS context

This commit is contained in:
maximesinclair 2014-05-14 23:49:51 +02:00
parent 0318f485b7
commit b6f9ff848a

View File

@ -3,10 +3,11 @@
<c:set var="cfg" value="${applicationScope['cfg']}" /> <c:set var="cfg" value="${applicationScope['cfg']}" />
<c:set var="contextroot" value="${pageContext.request.contextPath}" /> <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.scheme == 'http' && pageContext.request.serverPort != 80) ||
<c:if test="${pageContext.request.serverPort == 80 }"> (pageContext.request.scheme == 'https' && pageContext.request.serverPort != 443) }">
<c:set var="hostpath" value="http://${pageContext.request.serverName}${contextroot}" /> <c:set var="port" value=":${pageContext.request.serverPort}" />
</c:if> </c:if>
<c:set var="hostpath" value="${pageContext.request.scheme}://${pageContext.request.serverName}${port}${contextroot}" />
<c:if test="${!empty encoded}"> <c:if test="${!empty encoded}">
<c:set var="imgurl" value="${hostpath}/png/${encoded}" /> <c:set var="imgurl" value="${hostpath}/png/${encoded}" />
<c:set var="svgurl" value="${hostpath}/svg/${encoded}" /> <c:set var="svgurl" value="${hostpath}/svg/${encoded}" />