Fix binstalk-downloader feature activation (#1297)

Fix use of `native-tls` and `git`, make sure that `gix` actually uses
`native-tls` in this scenario.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2023-08-17 08:34:03 +10:00 committed by GitHub
parent f0f0c2bd14
commit 146d3f8f43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -21,7 +21,7 @@ derive_destructure2 = "0.1"
flate2 = { version = "1.0.26", default-features = false } flate2 = { version = "1.0.26", default-features = false }
futures-util = "0.3.28" futures-util = "0.3.28"
generic-array = "0.14.7" generic-array = "0.14.7"
gix = { version = "0.51.0", features = ["blocking-http-transport-reqwest-rust-tls"], optional = true } gix = { version = "0.51.0", features = ["blocking-http-transport-reqwest"], optional = true }
httpdate = "1.0.2" httpdate = "1.0.2"
reqwest = { version = "0.11.18", features = ["stream", "gzip", "brotli", "deflate"], default-features = false } reqwest = { version = "0.11.18", features = ["stream", "gzip", "brotli", "deflate"], default-features = false }
percent-encoding = "2.2.0" percent-encoding = "2.2.0"
@ -76,8 +76,16 @@ rustls = [
# trust-dns-resolver currently supports https with rustls # trust-dns-resolver currently supports https with rustls
"trust-dns-resolver?/dns-over-https-rustls", "trust-dns-resolver?/dns-over-https-rustls",
"trust-dns-resolver?/dns-over-quic", "trust-dns-resolver?/dns-over-quic",
"gix?/blocking-http-transport-reqwest-rust-tls",
]
native-tls = [
"__tls",
"reqwest/native-tls",
"trust-dns-resolver?/dns-over-native-tls",
"gix?/blocking-http-transport-reqwest-native-tls",
] ]
native-tls = ["__tls", "reqwest/native-tls", "trust-dns-resolver?/dns-over-native-tls"]
# Enable trust-dns-resolver so that features on it will also be enabled. # Enable trust-dns-resolver so that features on it will also be enabled.
trust-dns = ["trust-dns-resolver", "reqwest/trust-dns"] trust-dns = ["trust-dns-resolver", "reqwest/trust-dns"]