use configured server port in cgis for mod_proxy

This commit is contained in:
Sebastian Sdorra
2011-02-06 16:22:54 +01:00
parent 6be07f0756
commit fb10867652
6 changed files with 76 additions and 36 deletions

View File

@@ -59,6 +59,7 @@ import java.util.Collection;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.Path;
import sonia.scm.util.HttpUtil;
/**
*
@@ -233,7 +234,7 @@ public class RepositoryResource extends AbstractResource<Repository>
StringBuilder url = new StringBuilder(request.getScheme());
url.append("://").append(configuration.getServername());
url.append(":").append(getPort(request));
url.append(":").append(HttpUtil.getServerPort(configuration, request));
String ctxPath = request.getContextPath();
@@ -271,34 +272,7 @@ public class RepositoryResource extends AbstractResource<Repository>
//~--- get methods ----------------------------------------------------------
/**
* Method description
*
*
* @param request
*
* @return
*/
private int getPort(HttpServletRequest request)
{
int port = 0;
if (configuration.isEnableSSL())
{
port = configuration.getSslPort();
}
else
{
port = configuration.getPort();
}
if (port <= 0)
{
port = request.getLocalPort();
}
return port;
}
/**
* Method description