Merge remote-tracking branch 'remotes/origin/fierce_fermion_6.2RC' into testnet

Author: anatolse

websocket/sessions.h

@@ -432,7 +432,7 @@ namespace beam
     {
     public:
         explicit
-            DetectSession(tcp::socket&& socket, ssl::context& ctx, SafeReactor::Ptr reactor, HandlerCreator creator)
+            DetectSession(tcp::socket&& socket, ssl::context* ctx, SafeReactor::Ptr reactor, HandlerCreator creator)
             : _stream(std::move(socket))
             , _ctx(ctx)
             , _reactor(reactor)
@@ -462,11 +462,14 @@ namespace beam
 
             if (result)
             {
+                if (_ctx == nullptr)
+                    return fail(ec, "tls is turned off");
+
                 // Launch SSL session
                 std::make_shared<SecureWebsocketSession>(
                     std::move(_stream),
                     std::move(_buffer),
-                    _ctx,
+                    *_ctx,
                     _reactor,
                     _creator)->run();
                 return;
@@ -481,7 +484,7 @@ namespace beam
         }
     private:
         beast::tcp_stream _stream;
-        ssl::context& _ctx;
+        ssl::context* _ctx;
         boost::beast::multi_buffer _buffer;
         SafeReactor::Ptr _reactor;
         HandlerCreator _creator;

websocket/websocket_server.cpp

@@ -102,7 +102,7 @@ namespace beam
                     if (m_allowedOrigin.empty())
                     {
                         // Create the Detect Session and run it
-                        std::make_shared<DetectSession>(std::move(m_socket), *m_tlsContext, m_reactor, m_handlerCreator)->run();
+                        std::make_shared<DetectSession>(std::move(m_socket), m_tlsContext, m_reactor, m_handlerCreator)->run();
                     }
                     else
                     {