Merge pull request #38 from leszekm1/master

fix pinging during upgrades

Author: mattqs

Src/EngineIoClientDotNet.mono/Client/Socket.cs

@@ -567,9 +567,18 @@ private void SetPing()
                 var log2 = LogManager.GetLogger(Global.CallerName());
                 log2.Info("EasyTimer SetPing start");
 
-                Ping();
-                OnHeartbeat(PingTimeout);
-                log2.Info("EasyTimer SetPing finish");
+                if (Upgrading)
+                {
+                    // skip this ping during upgrade
+                    SetPing();
+                    log2.Info("skipping Ping during upgrade");
+                }
+                else
+                {
+                    Ping();
+                    OnHeartbeat(PingTimeout);
+                    log2.Info("EasyTimer SetPing finish");
+                }
             }, (int)PingInterval);
         }
 
@@ -663,6 +672,11 @@ private Task WaitForUpgrade()
                         log.Info("Wait for upgrade timeout");
                         break;
                     }
+                    else
+                    {
+                        // yield to another thread
+                        System.Threading.Thread.Yield();
+                    }
                 }
                 tcs.SetResult(null);
             }