maybe fix #100 and #22

nuclearace · nuclearace · commit 8928ce26939a · 2015-07-12T20:40:41.000-04:00
diff --git 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 {

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,9 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`private func createWebsocket(andConnect connect:Bool) {`
`197`		`- ws = WebSocket(url: NSURL(string: urlWebSocket! + "&sid=\(sid)")!,`
	`197`	`+ let wsUrl = urlWebSocket! + (sid == "" ? "" : "&sid=\(sid)")`
	`198`	`+`
	`199`	`+ ws = WebSocket(url: NSURL(string: wsUrl)!,`
`198`	`200`	`cookies: cookies)`
`199`	`201`
`200`	`202`	`if extraHeaders != nil {`