Merge branch 'development'

* development: bump ws, fix #598 remove namespace from socket id
socketio · Dec 19, 2016 · 650538a · 650538a
2 parents 163a770 + b1debdf
commit 650538a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Source/SSLSecurity.swift b/Source/SSLSecurity.swift
@@ -26,7 +26,7 @@ public protocol SSLTrustValidator {
     func isValid(_ trust: SecTrust, domain: String?) -> Bool
 }
 
-open class SSLCert {
+open class SSLCert : NSObject {
     var certData: Data?
     var key: SecKey?
 

diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift
@@ -65,7 +65,7 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable
     var waitingPackets = [SocketPacket]()
 
     public var sid: String? {
-        return nsp + "#" + (engine?.sid ?? "")
+        return engine?.sid
     }
 
     /// Type safe way to create a new SocketIOClient. opts can be omitted

diff --git a/Source/WebSocket.swift b/Source/WebSocket.swift
@@ -162,6 +162,11 @@ open class WebSocket : NSObject, StreamDelegate {
     public init(url: URL, protocols: [String]? = nil) {
         self.url = url
         self.origin = url.absoluteString
+        if let hostUrl = URL (string: "/", relativeTo: url) {
+            var origin = hostUrl.absoluteString
+            origin.remove(at: origin.index(before: origin.endIndex))
+            self.origin = origin
+        }
         writeQueue.maxConcurrentOperationCount = 1
         optionalProtocols = protocols
     }