From d17ccac730aa16e8fe4225cdd50e069a43ed95ee Mon Sep 17 00:00:00 2001 From: Jun Kurihara Date: Mon, 10 Jun 2024 14:18:34 +0900 Subject: [PATCH 1/2] chore: update cache sematics --- rpxy-lib/Cargo.toml | 2 +- submodules/rusty-http-cache-semantics | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rpxy-lib/Cargo.toml b/rpxy-lib/Cargo.toml index 2115c22..a495007 100644 --- a/rpxy-lib/Cargo.toml +++ b/rpxy-lib/Cargo.toml @@ -97,7 +97,7 @@ s2n-quic-rustls = { version = "0.38.1", optional = true } socket2 = { version = "0.5.7", features = ["all"], optional = true } # cache -http-cache-semantics = { path = "../submodules/rusty-http-cache-semantics/", optional = true } +http-cache-semantics = { path = "../submodules/rusty-http-cache-semantics", default-features = false, optional = true } lru = { version = "0.12.3", optional = true } sha2 = { version = "0.10.8", default-features = false, optional = true } diff --git a/submodules/rusty-http-cache-semantics b/submodules/rusty-http-cache-semantics index 08a6b5a..d5b5efd 160000 --- a/submodules/rusty-http-cache-semantics +++ b/submodules/rusty-http-cache-semantics @@ -1 +1 @@ -Subproject commit 08a6b5a9dcb6f7d960007ae9c4265fe67851abfb +Subproject commit d5b5efd9de4dab3c958c50be5380652d801cc65f From 55c3bfb85ba2b11091e8e5da53d4f1d4f9071dbe Mon Sep 17 00:00:00 2001 From: Jun Kurihara Date: Mon, 10 Jun 2024 14:19:29 +0900 Subject: [PATCH 2/2] chore: typo and deps --- rpxy-certs/src/server_crypto.rs | 4 ++-- rpxy-lib/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rpxy-certs/src/server_crypto.rs b/rpxy-certs/src/server_crypto.rs index c6061d2..60ffcba 100644 --- a/rpxy-certs/src/server_crypto.rs +++ b/rpxy-certs/src/server_crypto.rs @@ -39,7 +39,7 @@ impl TryInto> for &ServerCryptoBase { type Error = RpxyCertError; fn try_into(self) -> Result, Self::Error> { - let aggregated = self.build_aggrated_server_crypto()?; + let aggregated = self.build_aggregated_server_crypto()?; let individual = self.build_individual_server_crypto_map()?; Ok(Arc::new(ServerCrypto { aggregated_config_no_client_auth: Arc::new(aggregated), @@ -117,7 +117,7 @@ impl ServerCryptoBase { /* ------------------------------------------------ */ /// Build aggregated server crypto inner object for no client auth server especially for http3 - fn build_aggrated_server_crypto(&self) -> Result { + fn build_aggregated_server_crypto(&self) -> Result { let mut resolver_global = ResolvesServerCertUsingSni::new(); // AWS LC provider by default diff --git a/rpxy-lib/Cargo.toml b/rpxy-lib/Cargo.toml index a495007..075f9f6 100644 --- a/rpxy-lib/Cargo.toml +++ b/rpxy-lib/Cargo.toml @@ -83,7 +83,7 @@ tokio-rustls = { version = "0.26.0", features = ["early-data"] } tracing = { version = "0.1.40" } # http/3 -quinn = { version = "0.11.1", optional = true } +quinn = { version = "0.11.2", optional = true } h3 = { version = "0.0.5", optional = true } h3-quinn = { version = "0.0.6", optional = true } s2n-quic-h3 = { path = "../submodules/s2n-quic-h3/", optional = true }