Merge branch 'master' into 1.2

This commit is contained in:
Erik 2015-03-31 14:27:35 -04:00
commit 918d40d68c

View File

@ -443,6 +443,8 @@ public class SocketEngine: NSObject, WebSocketDelegate {
self.upgradeTransport() self.upgradeTransport()
return return
} }
return
} else if type == PacketType.OPEN.rawValue { } else if type == PacketType.OPEN.rawValue {
var err:NSError? var err:NSError?