From cfa6a217be20dc2f9b17868f99b2d34099e8bd9a Mon Sep 17 00:00:00 2001 From: Hugo Schouman Date: Mon, 3 Sep 2018 15:51:20 +0200 Subject: [PATCH 1/2] fix cookies import when create the websocket --- Source/SocketIO/Engine/SocketEngine.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/SocketIO/Engine/SocketEngine.swift b/Source/SocketIO/Engine/SocketEngine.swift index 738bf30..52076c9 100644 --- a/Source/SocketIO/Engine/SocketEngine.swift +++ b/Source/SocketIO/Engine/SocketEngine.swift @@ -281,7 +281,7 @@ open class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePollable, So private func createWebSocketAndConnect() { var req = URLRequest(url: urlWebSocketWithSid) - addHeaders(to: &req, includingCookies: session?.configuration.httpCookieStorage?.cookies) + addHeaders(to: &req, includingCookies: session?.configuration.httpCookieStorage?.cookies(for: urlWebSocketWithSid)) ws = WebSocket(request: req) ws?.callbackQueue = engineQueue From 867db19bc5ee69ddff2beb88c8700fa2ce71aff2 Mon Sep 17 00:00:00 2001 From: Hugo Schouman Date: Wed, 5 Sep 2018 19:26:35 +0200 Subject: [PATCH 2/2] set the right URL in websocket creation --- Source/SocketIO/Engine/SocketEngine.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/SocketIO/Engine/SocketEngine.swift b/Source/SocketIO/Engine/SocketEngine.swift index 52076c9..da0cbc0 100644 --- a/Source/SocketIO/Engine/SocketEngine.swift +++ b/Source/SocketIO/Engine/SocketEngine.swift @@ -281,7 +281,7 @@ open class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePollable, So private func createWebSocketAndConnect() { var req = URLRequest(url: urlWebSocketWithSid) - addHeaders(to: &req, includingCookies: session?.configuration.httpCookieStorage?.cookies(for: urlWebSocketWithSid)) + addHeaders(to: &req, includingCookies: session?.configuration.httpCookieStorage?.cookies(for: urlPollingWithSid)) ws = WebSocket(request: req) ws?.callbackQueue = engineQueue