aboutsummaryrefslogtreecommitdiff
path: root/scripts/download-from-binary-cache.pl.in
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-02-26 16:07:43 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-02-26 16:07:43 +0100
commit7f74513b4e5b632b4099702cf4fe2800de7b67f9 (patch)
tree5bf26df2d1eb0cc10e4249d9db6bedce381d62f8 /scripts/download-from-binary-cache.pl.in
parent00d761016a33ff9aa0ea162402d0d846dd1927cb (diff)
Also provide an option for setting the curl connection timeout
Diffstat (limited to 'scripts/download-from-binary-cache.pl.in')
-rw-r--r--scripts/download-from-binary-cache.pl.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/download-from-binary-cache.pl.in b/scripts/download-from-binary-cache.pl.in
index 4f7ff12e8..8b49a2517 100644
--- a/scripts/download-from-binary-cache.pl.in
+++ b/scripts/download-from-binary-cache.pl.in
@@ -44,7 +44,10 @@ my $userName = getpwuid($<) || $ENV{"USER"} or die "cannot figure out user name"
my $requireSignedBinaryCaches = ($Nix::Config::config{"signed-binary-caches"} // "0") ne "0";
-my $curlConnectTimeout = int($ENV{"NIX_CONNECT_TIMEOUT"} // 0);
+my $curlConnectTimeout = int(
+ $Nix::Config::config{"untrusted-connect-timeout"} //
+ $Nix::Config::config{"connect-timeout"} //
+ $ENV{"NIX_CONNECT_TIMEOUT"} // 0);
sub addRequest {