From fc512af05c7a7573ba4af6cb280f63f478c26a77 Mon Sep 17 00:00:00 2001 From: Colin Willson Date: Fri, 26 Jan 2024 19:06:08 -0500 Subject: [PATCH 1/2] Testing updated URI --- Sources/WebSocketKit/WebSocketClient.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Sources/WebSocketKit/WebSocketClient.swift b/Sources/WebSocketKit/WebSocketClient.swift index 0e2cefd1..a8a04f58 100644 --- a/Sources/WebSocketKit/WebSocketClient.swift +++ b/Sources/WebSocketKit/WebSocketClient.swift @@ -117,8 +117,7 @@ public final class WebSocketClient: Sendable { uri = path } else { let relativePath = path.hasPrefix("/") ? path : "/" + path - let port = proxyPort.map { ":\($0)" } ?? "" - uri = "\(scheme)://\(host)\(relativePath)\(port)" + uri = "\(scheme)://\(host):\(port)\(relativePath)" if scheme == "ws" { upgradeRequestHeaders.add(contentsOf: proxyHeaders) From 0f36ebe2125c47f400ae13ea3f61e34760c99931 Mon Sep 17 00:00:00 2001 From: Colin Willson Date: Thu, 1 Feb 2024 16:37:16 -0500 Subject: [PATCH 2/2] Fix configuration not passed when using proxy/port --- Sources/WebSocketKit/WebSocket+Connect.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Sources/WebSocketKit/WebSocket+Connect.swift b/Sources/WebSocketKit/WebSocket+Connect.swift index a46dd397..3c2b9f7b 100644 --- a/Sources/WebSocketKit/WebSocket+Connect.swift +++ b/Sources/WebSocketKit/WebSocket+Connect.swift @@ -193,6 +193,7 @@ extension WebSocket { proxyPort: proxyPort, proxyHeaders: proxyHeaders, proxyConnectDeadline: proxyConnectDeadline, + configuration: configuration, on: eventLoopGroup, onUpgrade: onUpgrade )