Skip to content

Commit 57e6b3a

Browse files
committed
Auto merge of #5973 - lostiniceland:5717-update-docs, r=alexcrichton
Do not use a disabled-option in the docs Updates #5717 Since people tend to copy/paste, the docs should not use the option which will disable curls low-speed-limit. Rather use a value lower than the default of 10 Also reverts removal of default low-speed-time (30s) in case no timeout is configured
2 parents b714d42 + 189f14f commit 57e6b3a

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

src/cargo/ops/registry.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,7 @@ pub fn configure_http_handle(config: &Config, handle: &mut Easy) -> CargoResult<
367367
// connect phase as well as a "low speed" timeout so if we don't receive
368368
// many bytes in a large-ish period of time then we time out.
369369
handle.connect_timeout(Duration::new(30, 0))?;
370+
handle.low_speed_time(Duration::new(30, 0))?;
370371
handle.low_speed_limit(http_low_speed_limit(config)?)?;
371372
if let Some(proxy) = http_proxy(config)? {
372373
handle.proxy(&proxy)?;

src/doc/src/reference/config.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ proxy = "host:port" # HTTP proxy to use for HTTP requests (defaults to none)
9595
timeout = 60000 # Timeout for each HTTP request, in milliseconds
9696
cainfo = "cert.pem" # Path to Certificate Authority (CA) bundle (optional)
9797
check-revoke = true # Indicates whether SSL certs are checked for revocation
98-
low-speed-limit = 0 # Lower threshold for bytes/sec (10 = default, 0 = disabled)
98+
low-speed-limit = 5 # Lower threshold for bytes/sec (10 = default, 0 = disabled)
9999

100100
[build]
101101
jobs = 1 # number of parallel jobs, defaults to # of CPUs

0 commit comments

Comments
 (0)