Skip to content

Commit 7474766

Browse files
committed
chore(saluki-io): switch hyper-http-proxy back to upstream crate
metalbear-co/hyper-http-proxy#9 merged and released as 1.2.0, so the fork patch is no longer needed.
1 parent f7fd65c commit 7474766

2 files changed

Lines changed: 4 additions & 10 deletions

File tree

Cargo.lock

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ http = { version = "1", default-features = false }
119119
http-body = { version = "1", default-features = false }
120120
http-body-util = { version = "0.1", default-features = false }
121121
hyper = { version = "1", default-features = false }
122-
hyper-http-proxy = { version = "1.1", default-features = false, features = [
122+
hyper-http-proxy = { version = "1.2", default-features = false, features = [
123123
"rustls-tls-native-roots",
124124
] }
125125
hyper-rustls = { version = "0.27", default-features = false, features = [
@@ -258,13 +258,6 @@ antithesis-instrumentation = { version = "0.1" }
258258
antithesis_sdk = { git = "https://github.com/antithesishq/antithesis-sdk-rust", rev = "78c9db56771f0f6b01cb5404765c5a96852c159c", default-features = false } # 0.2.8 is pinned to rand 0.8, rev version allows us to select workspace rand
259259
mime = "0.3"
260260

261-
[patch.crates-io]
262-
# Forked version of `hyper-http-proxy` that adds a timeout for the TLS handshake performed when
263-
# tunneling to an HTTPS destination through a proxy. Tracked upstream at
264-
# https://github.com/metalbear-co/hyper-http-proxy/pull/9; switch back to the upstream crate once
265-
# that merges.
266-
hyper-http-proxy = { git = "https://github.com/jszwedko/hyper-http-proxy.git", branch = "jszwedko/tls-handshake-timeout" }
267-
268261
[profile.devel]
269262
inherits = "dev"
270263

0 commit comments

Comments
 (0)