Skip to content

Commit 98cfbec

Browse files
committed
fix: forward curl rustls feature from gix-transport to avoid curl in gix. (#1328)
This removes the `curl` dependency just for configuring it, and removes a hazard which became evident with reqwest.
1 parent e3eedd8 commit 98cfbec

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

Cargo.lock

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gix-transport/Cargo.toml

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ http-client = [
3030
]
3131
## Implies `http-client`, and adds support for the http and https transports using the Rust bindings for `libcurl`.
3232
http-client-curl = ["curl", "http-client"]
33+
## Implies `http-client-curl` and enables `rustls` for creationg `https://` connections.
34+
http-client-curl-rust-tls = ["http-client-curl", "curl/rustls"]
3335
### Implies `http-client` and adds support for http and https transports using the blocking version of `reqwest`.
3436
http-client-reqwest = ["reqwest", "http-client"]
3537
## Stacks with `blocking-http-transport-reqwest` and enables `https://` via the `rustls` crate.

gix/Cargo.toml

+1-5
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,7 @@ blocking-http-transport-curl = [
169169
## Stacks with `blocking-http-transport-curl` and also enables the `rustls` backend to avoid `openssl`.
170170
blocking-http-transport-curl-rustls = [
171171
"blocking-http-transport-curl",
172-
"dep:curl",
173-
"curl?/rustls",
172+
"gix-transport/http-client-curl-rust-tls",
174173
]
175174
## Stacks with `blocking-network-client` to provide support for HTTP/S using **reqwest**, and implies blocking networking as a whole, making the `https://` transport available.
176175
blocking-http-transport-reqwest = [
@@ -364,9 +363,6 @@ serde = { version = "1.0.114", optional = true, default-features = false, featur
364363
smallvec = "1.9.0"
365364
async-std = { version = "1.12.0", optional = true }
366365

367-
# Used for feature-configuration only.
368-
curl = { workspace = true, optional = true }
369-
370366
## For use in rev-parse, which provides searching commits by running a regex on their message.
371367
##
372368
## If disabled, the text will be search verbatim in any portion of the commit message, similar to

0 commit comments

Comments
 (0)