Catch Errno::ETIMEDOUT for downloading boxes [GH-849]

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## 1.1.0 (unreleased)
 
   - Improve the SSH "ready?" check. [GH-841]
+  - Human friendly error if connection times out for HTTP downloads. [GH-849]
 
 ## 1.0.2 (March 25, 2012)
 

lib/vagrant/downloaders/http.rb

@@ -68,6 +68,8 @@ module Vagrant
             @ui.clear_line
           end
         end
+      rescue Errno::ETIMEDOUT
+        raise Errors::DownloaderHTTPConnectTimeout
       rescue SocketError
         raise Errors::DownloaderHTTPSocketError
       end

lib/vagrant/errors.rb

@@ -163,6 +163,11 @@ module Vagrant
       error_key(:file_missing, "vagrant.downloaders.file")
     end
 
+    class DownloaderHTTPConnectTimeout < VagrantError
+      status_code(79)
+      error_key(:connection_timeout, "vagrant.downloaders.http")
+    end
+
     class DownloaderHTTPSocketError < VagrantError
       status_code(38)
       error_key(:socket_error, "vagrant.downloaders.http")

templates/locales/en.yml

@@ -587,6 +587,9 @@ en:
         download: "Copying box to temporary location..."
         file_missing: "The specified path to a file doesn't exist."
       http:
+        connection_timeout: |-
+          Vagrant timed out while attempting to connect to the HTTP host.
+          Please check your internet and proxy settings and try again.
         download: "Downloading box: %{url}"
         socket_error: |-
           An error occurred while trying to download the specified box. This most