cheykrym/socket.io-client-swift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor engine. Fix infinite recursion in configuration

Browse Source
This commit is contained in:
Erik 2016-08-27 13:05:22 -04:00
parent 4de7a48e87
commit bd7f94333d
No known key found for this signature in database
GPG Key ID: 4930B7C5FBC1A69D
2 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/SocketEngine.swift
View File

@ -359,8 +359,11 @@ public final class SocketEngine : NSObject, NSURLSessionDelegate, SocketEnginePo
private func handleOpen(openData: String) { private func handleOpen(openData: String) {
do { do {
let json = try openData.toNSDictionary() let json = try openData.toNSDictionary()
guard let sid = json[sid] as? String else {
client?.engineDidError("Open packet contained no sid")
return
}
if let sid = json["sid"] as? String {
let upgradeWs: Bool let upgradeWs: Bool
self.sid = sid self.sid = sid
@ -388,7 +391,6 @@ public final class SocketEngine : NSObject, NSURLSessionDelegate, SocketEnginePo
} }
client?.engineDidOpen("Connect") client?.engineDidOpen("Connect")
}
} catch { } catch {
didError("Error parsing open packet") didError("Error parsing open packet")
} }

2
Source/SocketIOClientConfiguration.swift
View File

@ -97,7 +97,7 @@ public struct SocketIOClientConfiguration : ArrayLiteralConvertible, CollectionT
@warn_unused_result @warn_unused_result
public func prefixThrough(position: Index) -> SubSequence { public func prefixThrough(position: Index) -> SubSequence {
return prefixThrough(position) return backingArray.prefixThrough(position)
} }
@warn_unused_result @warn_unused_result