Merge branch '0.21' into feature/events

pocketnetteam · Jun 27, 2022 · f862108 · f862108
2 parents 8090d0e + 4429a24
commit f862108
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
@@ -812,12 +812,8 @@ void HTTPWebSocket::StartHTTPSocket(int threadCount, int threadPostCount, bool s
 void HTTPWebSocket::StopHTTPSocket()
 {   
     // Interrupting socket here because stop without interrupting is illegal.
-    InterruptHTTPSocket();
-
-    // Resetting queue as it has done previously that restricts running this socket again.
-    // However this doesn't affect current rpc handlers because they handle their own shared_ptr of queue, but adding new rpc handlers
-    // is UB after this call.
-    m_workQueue.reset();
+    HTTPSocket::InterruptHTTPSocket();
+    HTTPSocket::StopHTTPSocket();
     m_workPostQueue.reset();
 }