merge with branch issue-155

This commit is contained in:
Sebastian Sdorra
2012-05-24 19:28:39 +02:00
2 changed files with 7 additions and 5 deletions

View File

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