6 files changed, 40 insertions, 10 deletions

diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index 97b6a09e..693cdbdb 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -227,6 +227,7 @@ local defaults = {
    lua_interpreter = site_config.LUA_INTERPRETER or "lua",
    downloader = site_config.LUAROCKS_DOWNLOADER or "wget",
    md5checker = site_config.LUAROCKS_MD5CHECKER or "md5sum",
+   connection_timeout = 30,  -- 0 = no timeout
 
    variables = {
       MAKE = "make",
diff --git a/src/luarocks/command_line.lua b/src/luarocks/command_line.lua
index 3cde4c41..cc2e1683 100644
--- a/src/luarocks/command_line.lua
+++ b/src/luarocks/command_line.lua
@@ -83,6 +83,15 @@ function command_line.run_command(...)
       fs.verbose()
    end
 
+   if flags["timeout"] then   -- setting it in the config file will kick-in earlier in the process
+      local timeout = tonumber(flags["timeout"])
+      if timeout then
+         cfg.connection_timeout = timeout
+      else
+         die "Argument error: --timeout expects a numeric argument."
+      end
+   end
+
    if flags["version"] then
       util.printout(program.." "..cfg.program_version)
       util.printout(program_description)
diff --git a/src/luarocks/fs/lua.lua b/src/luarocks/fs/lua.lua
index cd705eef..f18deac3 100644
--- a/src/luarocks/fs/lua.lua
+++ b/src/luarocks/fs/lua.lua
@@ -551,6 +551,9 @@ local function request(url, method, http, loop_control)
       io.write(method.." "..url.." ...\n")
    end
    local dots = 0
+   if cfg.connection_timeout and cfg.connection_timeout > 0 then
+      http.TIMEOUT = cfg.connection_timeout
+   end
    local res, status, headers, err = http.request {
       url = url,
       proxy = proxy,
diff --git a/src/luarocks/fs/unix/tools.lua b/src/luarocks/fs/unix/tools.lua
index d381b8d9..f8f39eca 100644
--- a/src/luarocks/fs/unix/tools.lua
+++ b/src/luarocks/fs/unix/tools.lua
@@ -246,20 +246,27 @@ function tools.download(url, filename, cache)
 
    local ok
    if cfg.downloader == "wget" then
-      local wget_cmd = vars.WGET.." --no-check-certificate --no-cache --user-agent='"..cfg.user_agent.." via wget' --quiet "
+      local wget_cmd = fs.Q(vars.WGET).." --no-check-certificate --no-cache --user-agent='"..cfg.user_agent.." via wget' --quiet "
+      if cfg.connection_timeout and cfg.connection_timeout > 0 then
+        wget_cmd = wget_cmd .. "--timeout="..tonumber(cfg.connection_timeout).." --tries=1 " 
+      end
       if cache then
          -- --timestamping is incompatible with --output-document,
          -- but that's not a problem for our use cases.
          fs.change_dir(dir.dir_name(filename))
-         ok = fs.execute(wget_cmd.." --timestamping ", url)
+         ok = fs.execute_quiet(wget_cmd.." --timestamping ", url)
          fs.pop_dir()
       elseif filename then
-         ok = fs.execute(wget_cmd.." --output-document "..fs.Q(filename), url)
+         ok = fs.execute_quiet(wget_cmd.." --output-document ", filename, url)
       else
-         ok = fs.execute(wget_cmd, url)
+         ok = fs.execute_quiet(wget_cmd, url)
       end
    elseif cfg.downloader == "curl" then
-      ok = fs.execute_string(vars.CURL.." -f -L --user-agent '"..cfg.user_agent.." via curl' "..fs.Q(url).." 2> /dev/null 1> "..fs.Q(filename))
+      local curl_cmd = fs.Q(vars.CURL).." -f -k -L --user-agent '"..cfg.user_agent.." via curl' "
+      if cfg.connection_timeout and cfg.connection_timeout > 0 then
+        curl_cmd = curl_cmd .. "--connect-timeout="..tonumber(cfg.connection_timeout).." " 
+      end
+      ok = fs.execute_string(curl_cmd..fs.Q(url).." 2> /dev/null 1> "..fs.Q(filename))
    end
    if ok then
       return true, filename
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index bd7ba086..21d846b9 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -257,19 +257,26 @@ function tools.download(url, filename, cache)
    local ok   
    if cfg.downloader == "wget" then
       local wget_cmd = fs.Q(vars.WGET).." --no-check-certificate --no-cache --user-agent=\""..cfg.user_agent.." via wget\" --quiet "
+      if cfg.connection_timeout and cfg.connection_timeout > 0 then
+        wget_cmd = wget_cmd .. "--timeout="..tonumber(cfg.connection_timeout).." --tries=1 " 
+      end
       if cache then
          -- --timestamping is incompatible with --output-document,
          -- but that's not a problem for our use cases.
          fs.change_dir(dir.dir_name(filename))
-         ok = fs.execute(wget_cmd.." --timestamping "..fs.Q(url).." 2> NUL 1> NUL")
+         ok = fs.execute_quiet(wget_cmd.." --timestamping ", url)
          fs.pop_dir()
       elseif filename then
-         ok = fs.execute(wget_cmd.." --output-document "..fs.Q(filename).." "..fs.Q(url).." 2> NUL 1> NUL")
+         ok = fs.execute_quiet(wget_cmd.." --output-document ", filename, url)
       else
-         ok = fs.execute(wget_cmd..fs.Q(url).." 2> NUL 1> NUL")
+         ok = fs.execute_quiet(wget_cmd, url)
       end
    elseif cfg.downloader == "curl" then
-      ok = fs.execute_string(fs.Q(vars.CURL).." -f -L --user-agent \""..cfg.user_agent.." via curl\" "..fs.Q(url).." 2> NUL 1> "..fs.Q(filename))
+      local curl_cmd = vars.CURL.." -f -k -L --user-agent \""..cfg.user_agent.." via curl\" "
+      if cfg.connection_timeout and cfg.connection_timeout > 0 then
+        curl_cmd = curl_cmd .. "--connect-timeout="..tonumber(cfg.connection_timeout).." " 
+      end
+      ok = fs.execute_string(curl_cmd..fs.Q(url).." 2> NUL 1> "..fs.Q(filename))
    end
    if ok then
       return true, filename
diff --git a/src/luarocks/help.lua b/src/luarocks/help.lua
index 3e428a4a..0a155509 100644
--- a/src/luarocks/help.lua
+++ b/src/luarocks/help.lua
@@ -66,7 +66,10 @@ function help.run(...)
         --tree=<tree>          Which tree to operate on.
         --local                Use the tree in the user's home directory.
                                To enable it, see ']]..program..[[ help path'.
-        --verbose              Display verbose output of commands executed.]])
+        --verbose              Display verbose output of commands executed.
+        --timeout=<seconds>    Timeout on network operations, in seconds.
+                               0 means no timeout (wait forever).
+                               Default is ]]..cfg.connection_timeout..[[.]])
       print_section("VARIABLES")
       util.printout([[
         Variables from the "variables" table of the configuration file