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

merge with branch issue-155

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-05-24 19:28:39 +02:00
parent 8b74afdfa3 1716fc0532
commit d44a17a409
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java
View File

@@ -271,6 +271,8 @@ public class HgCGIServlet extends HttpServlet
CGIExecutor executor = cgiExecutorFactory.createExecutor(configuration, CGIExecutor executor = cgiExecutorFactory.createExecutor(configuration,
getServletContext(), request, response); getServletContext(), request, response);
// issue #155
executor.setPassShellEnvironment(true);
executor.setExceptionHandler(exceptionHandler); executor.setExceptionHandler(exceptionHandler);
executor.setStatusCodeHandler(exceptionHandler); executor.setStatusCodeHandler(exceptionHandler);
executor.setContentLengthWorkaround(true); executor.setContentLengthWorkaround(true);

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

@@ -130,6 +130,11 @@ public class DefaultCGIExecutor extends AbstractCGIExecutor
File command = new File(cmd); File command = new File(cmd);
EnvList env = new EnvList(environment); EnvList env = new EnvList(environment);
if (passShellEnvironment)
{
apendOsEnvironment(env);
}
// workaround for mercurial 2.1 // workaround for mercurial 2.1
if (isContentLengthWorkaround()) if (isContentLengthWorkaround())
{ {
@@ -296,11 +301,6 @@ public class DefaultCGIExecutor extends AbstractCGIExecutor
int len = request.getContentLength(); int len = request.getContentLength();
EnvList env = new EnvList(); EnvList env = new EnvList();
if (passShellEnvironment)
{
apendOsEnvironment(env);
}
env.set(ENV_AUTH_TYPE, request.getAuthType()); env.set(ENV_AUTH_TYPE, request.getAuthType());
/** /**