Merge pull request #1266 from paullouisageneau/fix-ws-race-disconnect

Fix race condition on WebSocket disconnect
paullouisageneau · Oct 2, 2024 · 9bbc79b · 9bbc79b
2 parents b068c8f + 1e6afd9
commit 9bbc79b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/impl/websocket.cpp b/src/impl/websocket.cpp
@@ -252,7 +252,8 @@ shared_ptr<TcpTransport> WebSocket::setTcpTransport(shared_ptr<TcpTransport> tra
 				remoteClose();
 				break;
 			case State::Disconnected:
-				remoteClose();
+				if(state == WebSocket::State::Connecting)
+					remoteClose();
 				break;
 			default:
 				// Ignore
@@ -303,7 +304,8 @@ shared_ptr<HttpProxyTransport> WebSocket::initProxyTransport() {
 				remoteClose();
 				break;
 			case State::Disconnected:
-				remoteClose();
+				if(state == WebSocket::State::Connecting)
+					remoteClose();
 				break;
 			default:
 				// Ignore
@@ -358,7 +360,8 @@ shared_ptr<TlsTransport> WebSocket::initTlsTransport() {
 				remoteClose();
 				break;
 			case State::Disconnected:
-				remoteClose();
+				if(state == WebSocket::State::Connecting)
+					remoteClose();
 				break;
 			default:
 				// Ignore