diff options
| author | Lorn Potter <lorn.potter@gmail.com> | 2023-02-20 10:44:54 +1000 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@gmail.com> | 2023-02-22 04:50:43 +1000 |
| commit | b14a7efd629895a03cdbfa433905509b5f014906 (patch) | |
| tree | eb325f6e672911d5ed1b2289c48b1d24eb6f3e7c | |
| parent | 9c72dca7ab26c57bc384393da8dfa21ca32534fb (diff) | |
| download | qtwebsockets-b14a7efd629895a03cdbfa433905509b5f014906.tar.gz | |
wasm: make sure connection is closed before being deleted
Pick-to: 6.5
Fixes: QTBUG-111248
Change-Id: I94a033fedf546c4d7f36af6c82a166dc33800f1f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| -rw-r--r-- | src/websockets/qwebsocket_p.cpp | 8 | ||||
| -rw-r--r-- | src/websockets/qwebsocket_wasm_p.cpp | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index e5d0698..2f1f534 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -177,8 +177,14 @@ void QWebSocketPrivate::init() QWebSocketPrivate::~QWebSocketPrivate() { #ifdef Q_OS_WASM - if (m_socketContext) + if (m_socketContext) { + uint16_t m_readyState; + emscripten_websocket_get_ready_state(m_socketContext, &m_readyState); + if (m_readyState == 1 || m_readyState == 0) { + emscripten_websocket_close(m_socketContext, 1000,""); + } emscripten_websocket_delete(m_socketContext); + } #endif } diff --git a/src/websockets/qwebsocket_wasm_p.cpp b/src/websockets/qwebsocket_wasm_p.cpp index c861fcf..e4d566b 100644 --- a/src/websockets/qwebsocket_wasm_p.cpp +++ b/src/websockets/qwebsocket_wasm_p.cpp @@ -120,7 +120,7 @@ void QWebSocketPrivate::close(QWebSocketProtocol::CloseCode closeCode, QString r emscripten_websocket_get_ready_state(m_socketContext, &m_readyState); - if (m_readyState == 1) { + if (m_readyState == 1 || m_readyState == 0) { emscripten_websocket_close(m_socketContext, (int)closeCode, reason.toUtf8()); } setSocketState(QAbstractSocket::UnconnectedState); |