Revert "[REMOVE] remove async_handshake return values"

This reverts commit 90fc956.
vinniefalco · Apr 27, 2017 · a3d0afa · a3d0afa
1 parent 90fc956
commit a3d0afa
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/include/beast/websocket/impl/handshake.ipp b/include/beast/websocket/impl/handshake.ipp
@@ -151,13 +151,15 @@ operator()(error_code ec, bool again)
         }
         }
     }
-    d_.invoke(ec);
+    // args to invoke must be on the stack
+    auto const res = std::move(d.res);
+    d_.invoke(ec, res);
 }
 
 template<class NextLayer>
 template<class HandshakeHandler>
 typename async_completion<HandshakeHandler,
-    void(error_code)>::result_type
+    void(error_code, response_type)>::result_type
 stream<NextLayer>::
 async_handshake(boost::string_ref const& host,
     boost::string_ref const& resource,
@@ -166,7 +168,7 @@ async_handshake(boost::string_ref const& host,
     static_assert(is_AsyncStream<next_layer_type>::value,
         "AsyncStream requirements not met");
     beast::async_completion<HandshakeHandler,
-        void(error_code)> completion{handler};
+        void(error_code, response_type)> completion{handler};
     handshake_op<decltype(completion.handler)>{
         completion.handler, *this, host, resource,
             &default_decorate_req};
@@ -176,7 +178,7 @@ async_handshake(boost::string_ref const& host,
 template<class NextLayer>
 template<class RequestDecorator, class HandshakeHandler>
 typename async_completion<HandshakeHandler,
-    void(error_code)>::result_type
+    void(error_code, response_type)>::result_type
 stream<NextLayer>::
 async_handshake_ex(boost::string_ref const& host,
     boost::string_ref const& resource,
@@ -189,7 +191,7 @@ async_handshake_ex(boost::string_ref const& host,
             RequestDecorator>::value,
         "RequestDecorator requirements not met");
     beast::async_completion<HandshakeHandler,
-        void(error_code)> completion{handler};
+        void(error_code, response_type)> completion{handler};
     handshake_op<decltype(completion.handler)>{
         completion.handler, *this, host, resource,
             decorator};

diff --git a/include/beast/websocket/stream.hpp b/include/beast/websocket/stream.hpp
@@ -1693,7 +1693,7 @@ class stream : public detail::stream_base
     void_or_deduced
 #else
     typename async_completion<HandshakeHandler,
-        void(error_code)>::result_type
+        void(error_code, response_type)>::result_type
 #endif
     async_handshake(boost::string_ref const& host,
         boost::string_ref const& resource,
@@ -1757,7 +1757,7 @@ class stream : public detail::stream_base
     void_or_deduced
 #else
     typename async_completion<HandshakeHandler,
-        void(error_code)>::result_type
+        void(error_code, response_type)>::result_type
 #endif
     async_handshake_ex(boost::string_ref const& host,
         boost::string_ref const& resource,

diff --git a/test/websocket/stream.cpp b/test/websocket/stream.cpp
@@ -377,30 +377,32 @@ class stream_test
         }
 
         template<class NextLayer>
-        void
+        response_type
         handshake(stream<NextLayer>& ws,
             boost::string_ref const& uri,
                 boost::string_ref const& path) const
         {
             error_code ec;
-            ws.async_handshake(
+            auto res = ws.async_handshake(
                 uri, path, yield_[ec]);
             if(ec)
                 throw system_error{ec};
+            return res;
         }
 
         template<class NextLayer, class Decorator>
-        void
+        response_type
         handshake_ex(stream<NextLayer>& ws,
             boost::string_ref const& uri,
                 boost::string_ref const& path,
                     Decorator const &d) const
         {
             error_code ec;
-            ws.async_handshake_ex(
+            auto res = ws.async_handshake_ex(
                 uri, path, d, yield_[ec]);
             if(ec)
                 throw system_error{ec};
+            return res;
         }
 
         template<class NextLayer>