Skip to content

Commit 852cf05

Browse files
author
Guanqun Lu
committed
add a bit more docs
1 parent a4e3b81 commit 852cf05

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

src/cargo/util/config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1860,7 +1860,7 @@ pub fn clippy_driver() -> PathBuf {
18601860
///
18611861
/// ```text
18621862
/// [http]
1863-
/// ssl-version = "tlsv.13"
1863+
/// ssl-version = "tlsv1.3"
18641864
/// ```
18651865
///
18661866
/// ```text

src/doc/src/reference/config.md

+7-2
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,13 @@ proxy = "host:port" # HTTP proxy to use for HTTP requests (defaults to none)
107107
timeout = 30 # Timeout for each HTTP request, in seconds
108108
cainfo = "cert.pem" # Path to Certificate Authority (CA) bundle (optional)
109109
check-revoke = true # Indicates whether SSL certs are checked for revocation
110-
ssl-version = "tlsv1.3" # Indicates which SSL version to use (defaults to
111-
# "default", "tlsv1", "tlsv1.0", "tlsv1.1", "tlsv1.2", "tlsv1.3")
110+
ssl-version = "tlsv1.3" # Indicates which SSL version or above to use (options are
111+
# "default", "tlsv1", "tlsv1.0", "tlsv1.1", "tlsv1.2", "tlsv1.3")
112+
# To better control SSL version, we can even use
113+
# `ssl-version.min = "..."` and `ssl-version.max = "..."`
114+
# where "..." is one of the above options. But note these two forms
115+
# ("setting `ssl-version`" and "setting both `min`/`max`)
116+
# can't co-exist.
112117
low-speed-limit = 5 # Lower threshold for bytes/sec (10 = default, 0 = disabled)
113118
multiplexing = true # whether or not to use HTTP/2 multiplexing where possible
114119

tests/testsuite/config.rs

-3
Original file line numberDiff line numberDiff line change
@@ -849,9 +849,6 @@ hello = 'world'
849849
.get::<Option<SslVersionConfig>>("http.ssl-version")
850850
.unwrap()
851851
.is_none());
852-
853-
let b = config.get_string("http.ssl-version").unwrap();
854-
println!("b: {:?}", if b.is_some() { "some" } else { "none" });
855852
}
856853

857854
#[cargo_test]

0 commit comments

Comments
 (0)