Skip to content

Commit

Permalink
add a bit more docs
Browse files Browse the repository at this point in the history
  • Loading branch information
Guanqun Lu committed Sep 30, 2019
1 parent a4e3b81 commit 852cf05
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/cargo/util/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1860,7 +1860,7 @@ pub fn clippy_driver() -> PathBuf {
///
/// ```text
/// [http]
/// ssl-version = "tlsv.13"
/// ssl-version = "tlsv1.3"
/// ```
///
/// ```text
Expand Down
9 changes: 7 additions & 2 deletions src/doc/src/reference/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,13 @@ proxy = "host:port" # HTTP proxy to use for HTTP requests (defaults to none)
timeout = 30 # Timeout for each HTTP request, in seconds
cainfo = "cert.pem" # Path to Certificate Authority (CA) bundle (optional)
check-revoke = true # Indicates whether SSL certs are checked for revocation
ssl-version = "tlsv1.3" # Indicates which SSL version to use (defaults to
# "default", "tlsv1", "tlsv1.0", "tlsv1.1", "tlsv1.2", "tlsv1.3")
ssl-version = "tlsv1.3" # Indicates which SSL version or above to use (options are
# "default", "tlsv1", "tlsv1.0", "tlsv1.1", "tlsv1.2", "tlsv1.3")
# To better control SSL version, we can even use
# `ssl-version.min = "..."` and `ssl-version.max = "..."`
# where "..." is one of the above options. But note these two forms
# ("setting `ssl-version`" and "setting both `min`/`max`)
# can't co-exist.
low-speed-limit = 5 # Lower threshold for bytes/sec (10 = default, 0 = disabled)
multiplexing = true # whether or not to use HTTP/2 multiplexing where possible

Expand Down
3 changes: 0 additions & 3 deletions tests/testsuite/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -849,9 +849,6 @@ hello = 'world'
.get::<Option<SslVersionConfig>>("http.ssl-version")
.unwrap()
.is_none());

let b = config.get_string("http.ssl-version").unwrap();
println!("b: {:?}", if b.is_some() { "some" } else { "none" });
}

#[cargo_test]
Expand Down

0 comments on commit 852cf05

Please sign in to comment.