Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-18 03:01:05 +01:00
Code Issues Packages Projects Releases Activity

replace ssl and forward parameters with base url to fix #32

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-06-23 18:20:09 +02:00
parent 0d2ecb8f0e
commit cc161e7fd3
7 changed files with 184 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIExecutor.java
View File

@@ -40,7 +40,6 @@ import org.slf4j.LoggerFactory;
import sonia.scm.SCMContext;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.util.HttpUtil;
import sonia.scm.util.IOUtil;
import sonia.scm.util.SystemUtil;
import sonia.scm.util.Util;
@@ -211,7 +210,8 @@ public class DefaultCGIExecutor extends AbstractCGIExecutor
private EnvList createEnvironment()
{
String pathInfo = request.getPathInfo();
int serverPort = HttpUtil.getServerPort(configuration, request);
// int serverPort = HttpUtil.getServerPort(configuration, request);
String scriptName = request.getRequestURI().substring(0,
request.getRequestURI().length() - pathInfo.length());
String scriptPath = context.getRealPath(scriptName);
@@ -260,7 +260,8 @@ public class DefaultCGIExecutor extends AbstractCGIExecutor
env.set(ENV_SCRIPT_NAME, scriptName);
env.set(ENV_SCRIPT_FILENAME, scriptPath);
env.set(ENV_SERVER_NAME, Util.nonNull(request.getServerName()));
env.set(ENV_SERVER_PORT, Integer.toString(serverPort));
// env.set(ENV_SERVER_PORT, Integer.toString(serverPort));
env.set(ENV_SERVER_PROTOCOL, Util.nonNull(request.getProtocol()));
env.set(
ENV_SERVER_SOFTWARE,