Merge pull request #353 from kinode-dao/revert-349-native-tls-feature-flag

Revert "native-tls so that wss:// type urls will work"
This commit is contained in:
doria 2024-05-18 03:27:12 +09:00 committed by GitHub
commit d6c2d9512b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2 additions and 12 deletions

3
Cargo.lock generated
View File

@ -5507,9 +5507,7 @@ checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38"
dependencies = [
"futures-util",
"log",
"native-tls",
"tokio",
"tokio-native-tls",
"tungstenite 0.21.0",
]
@ -5803,7 +5801,6 @@ dependencies = [
"http 1.1.0",
"httparse",
"log",
"native-tls",
"rand 0.8.5",
"sha1",
"thiserror",

View File

@ -84,7 +84,7 @@ snow = { version = "0.9.5", features = ["ring-resolver"] }
static_dir = "0.2.0"
thiserror = "1.0"
tokio = { version = "1.28", features = ["fs", "macros", "rt-multi-thread", "signal", "sync"] }
tokio-tungstenite = { version = "0.21.0", features = ["native-tls"] }
tokio-tungstenite = "0.21.0"
url = "2.4.1"
uuid = { version = "1.1.2", features = ["serde", "v4"] }
warp = "0.3.5"

View File

@ -218,14 +218,7 @@ async fn connect_websocket(
// Connect the WebSocket
let ws_stream = match connect_async(req).await {
Ok((ws_stream, _)) => ws_stream,
Err(e) => {
let _ = print_tx
.send(Printout {
verbosity: 1,
content: format!("http_client: underlying lib connection error {e:?}"),
})
.await;
Err(_) => {
return Err(HttpClientError::WsOpenFailed {
url: url.to_string(),
});