kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bad merge in IXWebSocketTransport.cpp ...

Browse Source
This commit is contained in:
Benjamin Sergeant
2019-04-19 09:41:16 -07:00
parent 03f762db86
commit a2d170f415
1 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ixwebsocket/IXWebSocketTransport.cpp
View File

@@ -234,13 +234,6 @@ namespace ix
{ {
PollResultType pollResult = _socket->poll(_pingIntervalOrTimeoutGCDSecs); PollResultType pollResult = _socket->poll(_pingIntervalOrTimeoutGCDSecs);
if (_readyState == OPEN)
{
// if (1) ping timeout is enabled and (2) duration since last received ping response (PONG)
// exceeds the maximum delay, then close the connection
if (pingTimeoutExceeded())
{
<<<<<<< HEAD
if (_readyState == OPEN) if (_readyState == OPEN)
{ {
// if (1) ping timeout is enabled and (2) duration since last received ping response (PONG) // if (1) ping timeout is enabled and (2) duration since last received ping response (PONG)
@@ -258,18 +251,6 @@ namespace ix
sendPing(ss.str()); sendPing(ss.str());
} }
} }
=======
close(1011, "Ping timeout");
}
// If (1) ping is enabled and no ping has been sent for a duration
// exceeding our ping interval, send a ping to the server.
else if (pingIntervalExceeded())
{
std::stringstream ss;
ss << kPingMessage << "::" << _pingIntervalSecs << "s";
sendPing(ss.str());
}
}
// Make sure we send all the buffered data // Make sure we send all the buffered data
// there can be a lot of it for large messages. // there can be a lot of it for large messages.