diff options
| author | Jonathan McCrohan <jmccrohan@gmail.com> | 2012-05-09 00:47:30 +0100 |
|---|---|---|
| committer | Jonathan McCrohan <jmccrohan@gmail.com> | 2012-05-09 00:47:30 +0100 |
| commit | 3d928d8dfe2d9af8b3d3ad2eb1d4b878d68704c4 (patch) | |
| tree | afd9aac45d87ca26cd83e5b176069195250a3d7f /csocketopen.c | |
| parent | d070ed533fe8afdc672c6f04875f2c73f478c196 (diff) | |
| parent | 260123716172d33f44bdc0e4e5422554d139215c (diff) | |
| download | libphidget21-3d928d8dfe2d9af8b3d3ad2eb1d4b878d68704c4.tar.gz | |
Merge tag 'upstream/2.1.8.20120507'
Upstream version 2.1.8.20120507
Diffstat (limited to 'csocketopen.c')
| -rw-r--r-- | csocketopen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/csocketopen.c b/csocketopen.c index caaecfc..4c12f5d 100644 --- a/csocketopen.c +++ b/csocketopen.c @@ -1269,7 +1269,7 @@ start: { //if we've been waiting too long, then signal disconnect double waitTime = timeSince(&server->lastHeartbeatTime); - //if we haven't recieved any heartbeats, set the timeout high (4*4 = 16 seconds) + //if we haven't received any heartbeats, set the timeout high (4*4 = 16 seconds) //This is so that really slow connections will get through the auth stage double avgPingTime = ((server->avgHeartbeatTimeCount > 0) ? (server->avgHeartbeatTime / server->avgHeartbeatTimeCount) : 4.0); |