Fix issue #1171: Order of object destruction (#1175)

- Connection object is now destroyed before client object
- Client is destroyed only when wspp_callback_client is destroyed to prevent race condition with the destructor

Author: dejaniv

Release/src/websockets/client/ws_client_wspp.cpp

@@ -689,9 +689,6 @@ class wspp_callback_client : public websocket_client_callback_impl,
                 }
             } // unlock
 
-            // Delete client to make sure Websocketpp cleans up all Boost.Asio portions.
-            m_client.reset();
-
             if (connecting)
             {
                 websocket_exception exc(ec, build_error_msg(ec, "set_fail_handler"));
@@ -801,15 +798,14 @@ class wspp_callback_client : public websocket_client_callback_impl,
         websocketpp::client<websocketpp::config::asio_tls_client> m_client;
     };
 
-    websocketpp::connection_hdl m_con;
-
     pplx::task_completion_event<void> m_connect_tce;
     pplx::task_completion_event<void> m_close_tce;
 
     // Used to safe guard the wspp client.
     std::mutex m_wspp_client_lock;
     State m_state;
     std::unique_ptr<websocketpp_client_base> m_client;
+    websocketpp::connection_hdl m_con;
 
     // Queue to track pending sends
     outgoing_msg_queue m_out_queue;