Git-Mirrors/veilid
1
0
Fork 0
mirror of https://gitlab.com/veilid/veilid.git synced 2024-12-24 06:49:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'swap-paths-for-ws-and-wss' into 'main'

Browse Source 
fix logic error that used wss when not tls

See merge request veilid/veilid!335
This commit is contained in:
Christien Rioux 2024-12-07 22:27:41 +00:00
commit 1387c512ce
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
veilid-core/src/network_manager/native/protocol/ws.rs
View File

@ -191,9 +191,9 @@ impl WebsocketProtocolHandler {
pub fn new(config: VeilidConfig, tls: bool) -> Self { pub fn new(config: VeilidConfig, tls: bool) -> Self {
let c = config.get(); let c = config.get();
let path = if tls { let path = if tls {
format!("GET /{}", c.network.protocol.ws.path.trim_end_matches('/'))
} else {
format!("GET /{}", c.network.protocol.wss.path.trim_end_matches('/')) format!("GET /{}", c.network.protocol.wss.path.trim_end_matches('/'))
} else {
format!("GET /{}", c.network.protocol.ws.path.trim_end_matches('/'))
}; };
let connection_initial_timeout_ms = if tls { let connection_initial_timeout_ms = if tls {
c.network.tls.connection_initial_timeout_ms c.network.tls.connection_initial_timeout_ms