update to quinn 0.11

bytedance · May 10, 2024 · 2354ccb · 2354ccb
1 parent b448fc2
commit 2354ccb
Show file tree

Hide file tree

Showing 27 changed files with 675 additions and 538 deletions.
diff --git a/.github/workflows/linux-musl.yml b/.github/workflows/linux-musl.yml
@@ -20,7 +20,7 @@ on:
 env:
   CARGO_TERM_COLOR: always
   MUSL_TARGET: x86_64-unknown-linux-musl
-  MUSL_FEATURES: --no-default-features --features vendored-openssl,vendored-c-ares,hickory
+  MUSL_FEATURES: --no-default-features --features vendored-openssl,quic,vendored-c-ares,hickory
 
 jobs:
   build:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -152,7 +152,7 @@ rustls = { version = "0.23.5", default-features = false, features = ["std", "tls
 rustls-pki-types = "1"
 rustls-pemfile = "2"
 tokio-rustls = { version = "0.26", default-features = false, features = ["tls12", "ring"] }
-quinn = { version = "0.10", default-features = false, features = ["native-certs"] }
+quinn = { version = "0.11", default-features = false, features = ["runtime-tokio"] }
 #
 openssl = { package = "variant-ssl", version = "0.14.2" }
 openssl-sys = { package = "variant-ssl-sys", version = "0.13.0" }
@@ -237,4 +237,5 @@ debug = 1
 debug-assertions = false
 
 [patch.crates-io]
-quinn-proto = { version = "0.10.6", git = "https://github.com/zh-jq/quinn.git", branch = "ring-0.17" }
+h3 = { version = "0.0.4", git = "https://github.com/djc/h3.git", branch = "quinn-0.11" }
+h3-quinn = { version = "0.0.5", git = "https://github.com/djc/h3.git", branch = "quinn-0.11" }
diff --git a/g3bench/Cargo.toml b/g3bench/Cargo.toml
@@ -20,7 +20,7 @@ url.workspace = true
 h2.workspace = true
 h3 = { workspace = true, optional = true }
 h3-quinn = { workspace = true, optional = true }
-quinn = { workspace = true, optional = true, features = ["tls-rustls", "runtime-tokio"] }
+quinn = { workspace = true, optional = true, features = ["rustls"] }
 bytes.workspace = true
 futures-util.workspace = true
 atomic-waker.workspace = true
@@ -57,7 +57,7 @@ g3-hickory-client.workspace = true
 rustc_version.workspace = true
 
 [features]
-default = []
+default = ["quic"]
 quic = ["g3-types/quic", "g3-socks/quic", "g3-io-ext/quic", "g3-hickory-client/quic", "dep:quinn", "dep:h3", "dep:h3-quinn"]
 vendored-openssl = ["openssl/vendored", "openssl-probe"]
 vendored-tongsuo = ["openssl/tongsuo", "openssl-probe", "g3-types/tongsuo"]