Merge branch 'master' into 1.2

2015-03-31 14:27:35 -04:00 · 2015-03-31 14:27:35 -04:00 · 918d40d68c
commit 918d40d68c
parent 5fffa685e9 01a699c7c6
1 changed files with 3 additions and 1 deletions
--- a/SwiftIO/SocketEngine.swift
+++ b/SwiftIO/SocketEngine.swift
@ -443,6 +443,8 @@ public class SocketEngine: NSObject, WebSocketDelegate {
                    self.upgradeTransport()
                    return
                }
+                
+                return
            } else if type == PacketType.OPEN.rawValue {
                var err:NSError?