This commit is contained in:
Erik 2015-04-21 12:03:48 -04:00
parent e33309827f
commit 47f5dcbbcd

View File

@ -125,7 +125,9 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
var byteArray = [UInt8](count: 1, repeatedValue: 0x0) var byteArray = [UInt8](count: 1, repeatedValue: 0x0)
byteArray[0] = 4 byteArray[0] = 4
var mutData = NSMutableData(bytes: &byteArray, length: 1) var mutData = NSMutableData(bytes: &byteArray, length: 1)
mutData.appendData(data) mutData.appendData(data)
return (mutData, nil) return (mutData, nil)
} else { } else {
var str = "b4" var str = "b4"
@ -501,7 +503,8 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
message.removeAtIndex(message.startIndex) message.removeAtIndex(message.startIndex)
let mesData = message.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)! let mesData = message.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)!
if let json = NSJSONSerialization.JSONObjectWithData(mesData, options: NSJSONReadingOptions.AllowFragments, if let json = NSJSONSerialization.JSONObjectWithData(mesData,
options: NSJSONReadingOptions.AllowFragments,
error: &err) as? NSDictionary, let sid = json["sid"] as? String { error: &err) as? NSDictionary, let sid = json["sid"] as? String {
self.sid = sid self.sid = sid
self._connected = true self._connected = true