Merge branch 'master' into user/bsergeant/close_with_params_plus_close_unittest

This commit is contained in:
Benjamin Sergeant 2019-05-10 19:42:28 -07:00 committed by GitHub
commit cbf0b826d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -221,6 +221,7 @@ namespace ix
} }
bool WebSocket::isConnectedOrClosing() const bool WebSocket::isConnectedOrClosing() const
{ {
return isConnected() || isClosing(); return isConnected() || isClosing();
} }