aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2014-05-26 00:55:18 -0300
committerHisham Muhammad <hisham@gobolinux.org>2014-05-26 00:55:18 -0300
commit4f66cbdbabc19e1b52ad3d82a800e2b892254718 (patch)
tree53903273c3e334648d227c477f180cefb03535c2 /src
parentceab1a6dde2c8960fad91e7eea56038e959bda9a (diff)
downloadluarocks-4f66cbdbabc19e1b52ad3d82a800e2b892254718.tar.gz
luarocks-4f66cbdbabc19e1b52ad3d82a800e2b892254718.tar.bz2
luarocks-4f66cbdbabc19e1b52ad3d82a800e2b892254718.zip
Fix curl --connect-timeout option following #261.
Diffstat (limited to 'src')
-rw-r--r--src/luarocks/fs/win32/tools.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index 21d846b9..a8b2a1db 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -274,7 +274,7 @@ function tools.download(url, filename, cache)
274 elseif cfg.downloader == "curl" then 274 elseif cfg.downloader == "curl" then
275 local curl_cmd = vars.CURL.." -f -k -L --user-agent \""..cfg.user_agent.." via curl\" " 275 local curl_cmd = vars.CURL.." -f -k -L --user-agent \""..cfg.user_agent.." via curl\" "
276 if cfg.connection_timeout and cfg.connection_timeout > 0 then 276 if cfg.connection_timeout and cfg.connection_timeout > 0 then
277 curl_cmd = curl_cmd .. "--connect-timeout="..tonumber(cfg.connection_timeout).." " 277 curl_cmd = curl_cmd .. "--connect-timeout "..tonumber(cfg.connection_timeout).." "
278 end 278 end
279 ok = fs.execute_string(curl_cmd..fs.Q(url).." 2> NUL 1> "..fs.Q(filename)) 279 ok = fs.execute_string(curl_cmd..fs.Q(url).." 2> NUL 1> "..fs.Q(filename))
280 end 280 end