Skip to content

Do not use a disabled-option in the docs #5973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 4, 2018
Merged

Do not use a disabled-option in the docs #5973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f88adb0
Do not use a disabled-option in the docs
lostiniceland Sep 4, 2018
189f14f
Revert removal of default-value for curl low-speed-time
lostiniceland Sep 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/cargo/ops/registry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,7 @@ pub fn configure_http_handle(config: &Config, handle: &mut Easy) -> CargoResult<
// connect phase as well as a "low speed" timeout so if we don't receive
// many bytes in a large-ish period of time then we time out.
handle.connect_timeout(Duration::new(30, 0))?;
handle.low_speed_time(Duration::new(30, 0))?;
handle.low_speed_limit(http_low_speed_limit(config)?)?;
if let Some(proxy) = http_proxy(config)? {
handle.proxy(&proxy)?;
Expand Down
2 changes: 1 addition & 1 deletion src/doc/src/reference/config.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ proxy = "host:port" # HTTP proxy to use for HTTP requests (defaults to none)
timeout = 60000 # Timeout for each HTTP request, in milliseconds
cainfo = "cert.pem" # Path to Certificate Authority (CA) bundle (optional)
check-revoke = true # Indicates whether SSL certs are checked for revocation
low-speed-limit = 0 # Lower threshold for bytes/sec (10 = default, 0 = disabled)
low-speed-limit = 5 # Lower threshold for bytes/sec (10 = default, 0 = disabled)

[build]
jobs = 1 # number of parallel jobs, defaults to # of CPUs
Expand Down