Auto merge of #1341 - alexcrichton:issue-1333, r=huonw

Closes #1333
rust-lang · Feb 24, 2015 · 8738c61 · 8738c61
2 parents 5bb4d8d + 777eadb
commit 8738c61
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/cargo/ops/registry.rs b/src/cargo/ops/registry.rs
@@ -161,7 +161,7 @@ pub fn registry(config: &Config,
 
 /// Create a new HTTP handle with appropriate global configuration for cargo.
 pub fn http_handle(config: &Config) -> CargoResult<http::Handle> {
-    let handle = http::handle();
+    let handle = http::handle().timeout(60);
     let handle = match try!(http_proxy(config)) {
         Some(proxy) => handle.proxy(proxy),
         None => handle,

diff --git a/src/doc/config.md b/src/doc/config.md
@@ -73,7 +73,7 @@ token = "..."   # Access token (found on the central repo's website)
 
 [http]
 proxy = "..."     # HTTP proxy to use for HTTP requests (defaults to none)
-timeout = 30000   # Timeout for each HTTP request, in milliseconds
+timeout = 60000   # Timeout for each HTTP request, in milliseconds
 
 [build]
 jobs = 1        # number of jobs to run by default (default to # cpus)