mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 21:42:27 +00:00
Merge commit '40983bac81df783cbf07ecfc5b1a71c444c00c79'
This commit is contained in:
commit
05f36b4772
7 files changed
+21
-14
No files matched your search
@@ -185,7 +185,7 @@ public class EnvVars extends TreeMap<String,String> {
|
||||
* when we later kill the processes.
|
||||
*/
|
||||
public static EnvVars createCookie() {
|
||||
return new EnvVars("HUDSON_COOKIE", UUID.randomUUID().toString());
|
||||
return new EnvVars("JENKINS_COOKIE", UUID.randomUUID().toString());
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -101,7 +101,8 @@ public class CommandLauncher extends ComputerLauncher {
|
||||
{// system defined variables
|
||||
String rootUrl = Hudson.getInstance().getRootUrl();
|
||||
if (rootUrl!=null) {
|
||||
pb.environment().put("HUDSON_URL", rootUrl);
|
||||
pb.environment().put("HUDSON_URL", rootUrl); // for backward compatibility
|
||||
pb.environment().put("JENKINS_URL", rootUrl);
|
||||
pb.environment().put("SLAVEJAR_URL", rootUrl+"/jnlpJars/slave.jar");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -308,7 +308,9 @@ public class JDKInstaller extends ToolInstaller {
|
||||
IOUtils.copy(new RetryableHttpStream(src) {
|
||||
@Override
|
||||
protected HttpURLConnection connect() throws IOException {
|
||||
return (HttpURLConnection) ProxyConfiguration.open(url);
|
||||
HttpURLConnection con = (HttpURLConnection) ProxyConfiguration.open(url);
|
||||
con.setReadTimeout(60*1000); // don't block forever, but don't let the slow client fail with false positives either
|
||||
return con;
|
||||
}
|
||||
}, out);
|
||||
} finally {
|
||||
|
||||
Reference in new issue
Block a user