From 8928ce26939aec466e536843b292ecebf86e0a40 Mon Sep 17 00:00:00 2001 From: Erik Date: Sun, 12 Jul 2015 20:40:23 -0400 Subject: [PATCH] maybe fix socketio/socket.io-client-swift#100 and socketio/socket.io-client-swift#22 --- SocketIOClientSwift/SocketEngine.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SocketIOClientSwift/SocketEngine.swift b/SocketIOClientSwift/SocketEngine.swift index 356f912..86f4b5c 100644 --- a/SocketIOClientSwift/SocketEngine.swift +++ b/SocketIOClientSwift/SocketEngine.swift @@ -194,7 +194,9 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient { } private func createWebsocket(andConnect connect:Bool) { - ws = WebSocket(url: NSURL(string: urlWebSocket! + "&sid=\(sid)")!, + let wsUrl = urlWebSocket! + (sid == "" ? "" : "&sid=\(sid)") + + ws = WebSocket(url: NSURL(string: wsUrl)!, cookies: cookies) if extraHeaders != nil {