tuxmain/rust-rpxy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert: purge client auth from main branch. it needs to reconsider...

Browse source
This commit is contained in:
Jun Kurihara 2022-10-13 18:11:21 +09:00
commit ddf4afbf4b
No known key found for this signature in database
GPG key ID: 48ADFD173ED22B03
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Cargo.toml
View file

@ -18,7 +18,7 @@ http3 = ["quinn", "h3", "h3-quinn"]
[dependencies]
env_logger = "0.9.1"
anyhow = "1.0.65"
clap = { version = "3.2.22", features = ["std", "cargo", "wrap_help"] }
clap = { version = "4.0.14", features = ["std", "cargo", "wrap_help"] }
futures = { version = "0.3.24", features = ["alloc", "async-await"] }
hyper = { version = "0.14.20", default-features = false, features = [
"server",
@ -27,7 +27,7 @@ hyper = { version = "0.14.20", default-features = false, features = [
"stream",
] }
log = "0.4.17"
tokio = { version = "1.21.1", default-features = false, features = [
tokio = { version = "1.21.2", default-features = false, features = [
"net",
"rt-multi-thread",
"parking_lot",
@ -41,7 +41,7 @@ rustls = { version = "0.20.6", default-features = false }
rand = "0.8.5"
toml = { version = "0.5.9", default-features = false }
rustc-hash = "1.1.0"
serde = { version = "1.0.144", default-features = false, features = ["derive"] }
serde = { version = "1.0.145", default-features = false, features = ["derive"] }
hyper-rustls = { version = "0.23.0", default-features = false, features = [
"tokio-runtime",
"webpki-tokio",
@ -52,7 +52,7 @@ bytes = "1.2.1"
quinn = { version = "0.8.5", optional = true }
h3 = { path = "./h3/h3/", optional = true }
h3-quinn = { path = "./h3/h3-quinn/", optional = true }
thiserror = "1.0.35"
thiserror = "1.0.37"
[target.'cfg(not(target_env = "msvc"))'.dependencies]

2
h3

@ -1 +1 @@
Subproject commit 27ef38d3940eb35205a6d8b1dd7c3f8d278d77b4
Subproject commit 720da6d652c41a5ac2b56c9bf602b756bd0032d3

4
src/config/parse.rs
View file

@ -18,12 +18,12 @@ pub fn parse_opts(globals: &mut Globals) -> std::result::Result<(), anyhow::Erro
Arg::new("config_file")
.long("config")
.short('c')
.takes_value(true)
.value_name("FILE")
.help("Configuration file path like \"./config.toml\""),
);
let matches = options.get_matches();
let config = if let Some(config_file_path) = matches.value_of("config_file") {
let config = if let Some(config_file_path) = matches.get_one::<String>("config_file") {
ConfigToml::new(config_file_path)?
} else {
// Default config Toml

2
src/utils/bytes_name.rs
View file

@ -20,7 +20,7 @@ impl PathNameBytesExp {
where
I: std::slice::SliceIndex<[u8]>,
{
(&self.0).get(index)
self.0.get(index)
}
pub fn starts_with(&self, needle: &Self) -> bool {
self.0.starts_with(&needle.0)