Merge branch 'master' into user/bsergeant/close_with_params_plus_close_unittest

2019-05-10 19:42:28 -07:00
parent 747b4495b0 ff81f5b496
commit cbf0b826d0
1 changed files with 1 additions and 0 deletions
--- a/ixwebsocket/IXWebSocket.cpp
+++ b/ixwebsocket/IXWebSocket.cpp
@ -221,6 +221,7 @@ namespace ix
    }

    bool WebSocket::isConnectedOrClosing() const
+
    {
        return isConnected() || isClosing();
    }