Merge branch 'patch-1'

Author: Byron

Cargo.lock

@@ -304,6 +304,8 @@ members = [
 prodash = { version = "28.0.0", default-features = false }
 futures-lite = { version = "2.1.0", default-features = false, features = ["std"] }
 faster-hex = { version = "0.9.0", default-features = false }
+reqwest = { version = "0.12.0", default-features = false, features = ["charset", "http2", "macos-system-configuration"] } # all but the 'default-tls' feature
+curl = { version = "0.4" }
 
 [package.metadata.docs.rs]
 features = ["document-features", "max"]

Cargo.toml

@@ -75,10 +75,10 @@ pin-project-lite = { version = "0.2.6", optional = true }
 base64 = { version = "0.21.0", optional = true }
 
 # for http-client-curl. Additional configuration should be performed on higher levels of the dependency tree.
-curl = { version = "0.4", optional = true }
+curl = { workspace = true, optional = true }
 
 # for http-client-reqwest
-reqwest = { version = "0.11.12", optional = true, default-features = false, features = ["blocking"] }
+reqwest = { workspace = true, optional = true, features = ["blocking"] }
 
 ## If used in conjunction with `async-client`, the `connect()` method will become available along with supporting the git protocol over TCP,
 ## where the TCP stream is created using this crate.

gix-transport/Cargo.toml

@@ -160,6 +160,7 @@ fn http_authentication_error_can_be_differentiated_and_identity_is_transmitted()
             .received_as_string()
             .lines()
             .map(str::to_lowercase)
+            .filter(ignore_reqwest_content_length)
             .collect::<HashSet<_>>(),
         format!(
             "GET /path/not-important/info/refs?service=git-upload-pack HTTP/1.1
@@ -187,6 +188,7 @@ Authorization: Basic dXNlcjpwYXNzd29yZA==
                 .lines()
                 .map(str::to_lowercase)
                 .filter(|l| !l.starts_with("expect: "))
+                .filter(ignore_reqwest_content_length)
                 .collect::<HashSet<_>>();
             // On linux on CI, for some reason, it won't have this chunk id here, but
             // it has it whenever and where-ever I run it.
@@ -337,6 +339,7 @@ fn handshake_v1() -> crate::Result {
             .received_as_string()
             .lines()
             .map(str::to_lowercase)
+            .filter(ignore_reqwest_content_length)
             .collect::<HashSet<_>>(),
         format!(
             "GET /path/not/important/due/to/mock/info/refs?service=git-upload-pack HTTP/1.1
@@ -550,6 +553,7 @@ fn handshake_and_lsrefs_and_fetch_v2_impl(handshake_fixture: &str) -> crate::Res
             .received_as_string()
             .lines()
             .map(str::to_lowercase)
+            .filter(ignore_reqwest_content_length)
             .collect::<HashSet<_>>(),
         format!(
             "GET /path/not/important/due/to/mock/info/refs?service=git-upload-pack HTTP/1.1
@@ -680,3 +684,7 @@ fn check_content_type_is_case_insensitive() -> crate::Result {
     assert!(result.is_ok());
     Ok(())
 }
+
+fn ignore_reqwest_content_length(header_line: &String) -> bool {
+    header_line != "content-length: 0"
+}

gix-transport/tests/client/blocking_io/http/mod.rs

@@ -127,16 +127,16 @@ blocking-network-client = ["gix-protocol/blocking-client", "gix-pack/streaming-i
 ## Stacks with `blocking-network-client` to provide support for HTTP/S using **curl**, and implies blocking networking as a whole, making the `https://` transport available.
 blocking-http-transport-curl = ["blocking-network-client", "gix-transport/http-client-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-for-configuration-only", "curl-for-configuration-only?/rustls"]
+blocking-http-transport-curl-rustls = ["blocking-http-transport-curl", "dep:curl", "curl?/rustls"]
 ## 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 = ["blocking-network-client", "gix-transport/http-client-reqwest"]
 ## Stacks with `blocking-http-transport-reqwest` and enables `https://` via the `rustls` crate.
-blocking-http-transport-reqwest-rust-tls = ["blocking-http-transport-reqwest", "reqwest-for-configuration-only/rustls-tls"]
+blocking-http-transport-reqwest-rust-tls = ["blocking-http-transport-reqwest", "reqwest/rustls-tls"]
 ## Stacks with `blocking-http-transport-reqwest` and enables `https://` via the `rustls` crate.
 ## This also makes use of `trust-dns` to avoid `getaddrinfo`, but note it comes with its own problems.
-blocking-http-transport-reqwest-rust-tls-trust-dns = ["blocking-http-transport-reqwest", "reqwest-for-configuration-only/rustls-tls", "reqwest-for-configuration-only/trust-dns"]
+blocking-http-transport-reqwest-rust-tls-trust-dns = ["blocking-http-transport-reqwest", "reqwest/rustls-tls", "reqwest/trust-dns"]
 ## Stacks with `blocking-http-transport-reqwest` and enables `https://` via the `native-tls` crate.
-blocking-http-transport-reqwest-native-tls = ["blocking-http-transport-reqwest", "reqwest-for-configuration-only/default-tls"]
+blocking-http-transport-reqwest-native-tls = ["blocking-http-transport-reqwest", "reqwest/default-tls"]
 
 
 #! #### Performance
@@ -305,8 +305,8 @@ serde = { version = "1.0.114", optional = true, default-features = false, featur
 smallvec = "1.9.0"
 async-std = { version = "1.12.0", optional = true }
 
-# Must match the one in `gix-transport`.
-curl-for-configuration-only = { package = "curl", version = "0.4", 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.
 ##
@@ -315,7 +315,7 @@ curl-for-configuration-only = { package = "curl", version = "0.4", optional = tr
 regex = { version = "1.6.0", optional = true, default-features = false, features = ["std"] }
 
 # For internal use to allow pure-Rust builds without openssl.
-reqwest-for-configuration-only = { package = "reqwest", version = "0.11.13", default-features = false, optional = true }
+reqwest = { workspace = true, optional = true }
 
 # for `interrupt` module
 parking_lot = "0.12.1"