diff --git a/CHANGELOG.md b/CHANGELOG.md index a6ea246..53a74b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ ## 0.9.0 (Unreleased) +## 0.8.1 + +### Improvement + +- Refactor: lots of minor improvements +- Deps + ## 0.8.0 ### Important Changes diff --git a/rpxy-bin/Cargo.toml b/rpxy-bin/Cargo.toml index 8c7df8f..d571d1e 100644 --- a/rpxy-bin/Cargo.toml +++ b/rpxy-bin/Cargo.toml @@ -30,7 +30,7 @@ rpxy-lib = { path = "../rpxy-lib/", default-features = false, features = [ mimalloc = { version = "*", default-features = false } anyhow = "1.0.86" rustc-hash = "2.0.0" -serde = { version = "1.0.203", default-features = false, features = ["derive"] } +serde = { version = "1.0.204", default-features = false, features = ["derive"] } tokio = { version = "1.38.0", default-features = false, features = [ "net", "rt-multi-thread", @@ -38,11 +38,11 @@ tokio = { version = "1.38.0", default-features = false, features = [ "sync", "macros", ] } -async-trait = "0.1.80" +async-trait = "0.1.81" # config -clap = { version = "4.5.8", features = ["std", "cargo", "wrap_help"] } +clap = { version = "4.5.9", features = ["std", "cargo", "wrap_help"] } toml = { version = "0.8.14", default-features = false, features = ["parse"] } hot_reload = "0.1.5" diff --git a/rpxy-certs/Cargo.toml b/rpxy-certs/Cargo.toml index 0cb9a87..1370e0b 100644 --- a/rpxy-certs/Cargo.toml +++ b/rpxy-certs/Cargo.toml @@ -20,13 +20,13 @@ tracing = { version = "0.1.40" } derive_builder = { version = "0.20.0" } thiserror = { version = "1.0.61" } hot_reload = { version = "0.1.5" } -async-trait = { version = "0.1.80" } -rustls = { version = "0.23.10", default-features = false, features = [ +async-trait = { version = "0.1.81" } +rustls = { version = "0.23.11", default-features = false, features = [ "std", "aws_lc_rs", ] } rustls-pemfile = { version = "2.1.2" } -rustls-webpki = { version = "0.102.4", default-features = false, features = [ +rustls-webpki = { version = "0.102.5", default-features = false, features = [ "std", "aws_lc_rs", ] } diff --git a/rpxy-lib/Cargo.toml b/rpxy-lib/Cargo.toml index c841d6a..669a81f 100644 --- a/rpxy-lib/Cargo.toml +++ b/rpxy-lib/Cargo.toml @@ -22,6 +22,7 @@ http3-s2n = [ "s2n-quic-rustls", "s2n-quic-h3", "rpxy-certs/http3", + "h3", ] cache = ["http-cache-semantics", "lru", "sha2", "base64"] sticky-cookie = ["base64", "sha2", "chrono"] @@ -44,7 +45,7 @@ tokio = { version = "1.38.0", default-features = false, features = [ "fs", ] } pin-project-lite = "0.2.14" -async-trait = "0.1.80" +async-trait = "0.1.81" # Error handling anyhow = "1.0.86" @@ -53,7 +54,7 @@ thiserror = "1.0.61" # http for both server and client http = "1.1.0" http-body-util = "0.1.2" -hyper = { version = "1.4.0", default-features = false } +hyper = { version = "1.4.1", default-features = false } hyper-util = { version = "0.1.6", features = ["full"] } futures-util = { version = "0.3.30", default-features = false } futures-channel = { version = "0.3.30", default-features = false } @@ -75,7 +76,7 @@ hyper-rustls = { git = "https://github.com/junkurihara/hyper-rustls", branch = " # tls and cert management for server rpxy-certs = { path = "../rpxy-certs/", default-features = false } hot_reload = "0.1.5" -rustls = { version = "0.23.10", default-features = false } +rustls = { version = "0.23.11", default-features = false } tokio-rustls = { version = "0.26.0", features = ["early-data"] } # logging @@ -88,11 +89,11 @@ h3-quinn = { version = "0.0.7", optional = true } s2n-quic-h3 = { path = "../submodules/s2n-quic-h3/", features = [ "tracing", ], optional = true } -s2n-quic = { version = "1.41.0", default-features = false, features = [ +s2n-quic = { version = "1.42.0", default-features = false, features = [ "provider-tls-rustls", ], optional = true } -s2n-quic-core = { version = "0.41.0", default-features = false, optional = true } -s2n-quic-rustls = { version = "0.41.0", optional = true } +s2n-quic-core = { version = "0.42.0", default-features = false, optional = true } +s2n-quic-rustls = { version = "0.42.0", optional = true } ########## # for UDP socket wit SO_REUSEADDR when h3 with quinn socket2 = { version = "0.5.7", features = ["all"], optional = true } diff --git a/rpxy-lib/src/error.rs b/rpxy-lib/src/error.rs index 3eb09e4..98ebf03 100644 --- a/rpxy-lib/src/error.rs +++ b/rpxy-lib/src/error.rs @@ -36,12 +36,12 @@ pub enum RpxyError { HyperBodyError(#[from] hyper::Error), // http/3 errors - #[cfg(feature = "http3-quinn")] + #[cfg(any(feature = "http3-quinn", feature = "http3-s2n"))] #[error("H3 error: {0}")] H3Error(#[from] h3::Error), - #[cfg(feature = "http3-s2n")] - #[error("H3 error: {0}")] - H3Error(#[from] s2n_quic_h3::h3::Error), + // #[cfg(feature = "http3-s2n")] + // #[error("H3 error: {0}")] + // H3Error(#[from] s2n_quic_h3::h3::Error), #[cfg(any(feature = "http3-quinn", feature = "http3-s2n"))] #[error("Exceeds max request body size for HTTP/3")] H3TooLargeBody, diff --git a/submodules/s2n-quic-h3/Cargo.toml b/submodules/s2n-quic-h3/Cargo.toml index f2a92de..4a0c725 100644 --- a/submodules/s2n-quic-h3/Cargo.toml +++ b/submodules/s2n-quic-h3/Cargo.toml @@ -15,8 +15,8 @@ futures = { version = "0.3", default-features = false } h3 = { version = "0.0.6", features = ["tracing"] } # s2n-quic = { path = "../s2n-quic" } # s2n-quic-core = { path = "../s2n-quic-core" } -s2n-quic = { version = "1.41.0" } -s2n-quic-core = { version = "0.41.0" } +s2n-quic = { version = "1.42.0" } +s2n-quic-core = { version = "0.42.0" } tracing = { version = "0.1.40", optional = true } [features]