Fix socketio#855

nuclearace · nuclearace · commit ff0f1c8c7718 · 2017-11-08T08:24:13.000-05:00
diff --git a/Source/SocketIO/Engine/SocketEngine.swift b/Source/SocketIO/Engine/SocketEngine.swift
@@ -563,8 +563,11 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
         pongsMissed += 1
         write("", withType: .ping, withData: [])
 
-        engineQueue.asyncAfter(deadline: DispatchTime.now() + .milliseconds(pingInterval)) {[weak self] in
-            self?.sendPing()
+        engineQueue.asyncAfter(deadline: DispatchTime.now() + .milliseconds(pingInterval)) {[weak self, id = self.sid] in
+            // Make sure not to ping old connections
+            guard let this = self, this.sid == id else { return }
+
+            this.sendPing()
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -563,8 +563,11 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll`
`563`	`563`	`pongsMissed += 1`
`564`	`564`	`write("", withType: .ping, withData: [])`
`565`	`565`
`566`		`- engineQueue.asyncAfter(deadline: DispatchTime.now() + .milliseconds(pingInterval)) {[weak self] in`
`567`		`- self?.sendPing()`
	`566`	`+ engineQueue.asyncAfter(deadline: DispatchTime.now() + .milliseconds(pingInterval)) {[weak self, id = self.sid] in`
	`567`	`+ // Make sure not to ping old connections`
	`568`	`+ guard let this = self, this.sid == id else { return }`
	`569`	`+`
	`570`	`+ this.sendPing()`
`568`	`571`	`}`
`569`	`572`	`}`
`570`	`573`