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

(websocket client) reset WebSocketTransport onClose callback in the WebSocket destructor

Browse Source
This commit is contained in:
Benjamin Sergeant
2020-07-24 10:03:29 -07:00
parent c26a2d5d39
commit 0f026c5da2
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/CHANGELOG.md
View File

@@ -1,6 +1,10 @@
# Changelog # Changelog
All changes to this project will be documented in this file. All changes to this project will be documented in this file.
## [9.10.2] - 2020-07-24
(websocket client) reset WebSocketTransport onClose callback in the WebSocket destructor
## [9.10.1] - 2020-07-24 ## [9.10.1] - 2020-07-24
(websocket server) reset client websocket callback when the connection is closed (websocket server) reset client websocket callback when the connection is closed

1
ixwebsocket/IXWebSocket.cpp
View File

@@ -46,6 +46,7 @@ namespace ix
WebSocket::~WebSocket() WebSocket::~WebSocket()
{ {
stop(); stop();
_ws.setOnCloseCallback(nullptr);
} }
void WebSocket::setUrl(const std::string& url) void WebSocket::setUrl(const std::string& url)

5
ixwebsocket/IXWebSocketTransport.cpp
View File

@@ -180,7 +180,10 @@ namespace ix
if (readyState == ReadyState::CLOSED) if (readyState == ReadyState::CLOSED)
{ {
std::lock_guard<std::mutex> lock(_closeDataMutex); std::lock_guard<std::mutex> lock(_closeDataMutex);
_onCloseCallback(_closeCode, _closeReason, _closeWireSize, _closeRemote); if (_onCloseCallback)
{
_onCloseCallback(_closeCode, _closeReason, _closeWireSize, _closeRemote);
}
_closeCode = WebSocketCloseConstants::kInternalErrorCode; _closeCode = WebSocketCloseConstants::kInternalErrorCode;
_closeReason = WebSocketCloseConstants::kInternalErrorMessage; _closeReason = WebSocketCloseConstants::kInternalErrorMessage;
_closeWireSize = 0; _closeWireSize = 0;

2
ixwebsocket/IXWebSocketVersion.h
View File

@@ -6,4 +6,4 @@
#pragma once #pragma once
#define IX_WEBSOCKET_VERSION "9.10.1" #define IX_WEBSOCKET_VERSION "9.10.2"