Skip to content

Commit

Permalink
fix: forward curl rustls feature from gix-transport to avoid `cur…
Browse files Browse the repository at this point in the history
…l` in `gix`. (#1328)

This removes the `curl` dependency just for configuring it, and removes
a hazard which became evident with reqwest.
  • Loading branch information
Byron committed Mar 24, 2024
1 parent e3eedd8 commit 98cfbec
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions gix-transport/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ http-client = [
]
## Implies `http-client`, and adds support for the http and https transports using the Rust bindings for `libcurl`.
http-client-curl = ["curl", "http-client"]
## Implies `http-client-curl` and enables `rustls` for creationg `https://` connections.
http-client-curl-rust-tls = ["http-client-curl", "curl/rustls"]
### Implies `http-client` and adds support for http and https transports using the blocking version of `reqwest`.
http-client-reqwest = ["reqwest", "http-client"]
## Stacks with `blocking-http-transport-reqwest` and enables `https://` via the `rustls` crate.
Expand Down
6 changes: 1 addition & 5 deletions gix/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,7 @@ blocking-http-transport-curl = [
## Stacks with `blocking-http-transport-curl` and also enables the `rustls` backend to avoid `openssl`.
blocking-http-transport-curl-rustls = [
"blocking-http-transport-curl",
"dep:curl",
"curl?/rustls",
"gix-transport/http-client-curl-rust-tls",
]
## 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.
blocking-http-transport-reqwest = [
Expand Down Expand Up @@ -364,9 +363,6 @@ serde = { version = "1.0.114", optional = true, default-features = false, featur
smallvec = "1.9.0"
async-std = { version = "1.12.0", optional = true }

# Used for feature-configuration only.
curl = { workspace = true, optional = true }

## For use in rev-parse, which provides searching commits by running a regex on their message.
##
## If disabled, the text will be search verbatim in any portion of the commit message, similar to
Expand Down

0 comments on commit 98cfbec

Please sign in to comment.