[FOLD] WIP

Author: vinniefalco

CMakeLists.txt

@@ -58,6 +58,7 @@ set(BOOST_BEAST_DEPENDENCIES
     Boost::asio
     Boost::assert
     Boost::bind
+    Boost::buffers
     Boost::config
     Boost::container
     Boost::container_hash

include/boost/beast/websocket/frame_reader.hpp

@@ -18,6 +18,7 @@
 #include <boost/beast/core/role.hpp>
 #include <boost/assert.hpp>
 #include <boost/beast/core/error.hpp>
+#include <boost/buffers/circular_buffer.hpp>
 #include <memory>
 
 #include <boost/core/span.hpp>

include/boost/beast/websocket/impl/read.hpp

@@ -199,16 +199,16 @@ class stream<NextLayer, deflateSupported>::read_some_op
                         if(bytes_transferred > 0)
                         {
                             system::error_code uec;
-                            auto const dest = impl.fs_.prepare();
+                            auto const dest = impl.fr_.prepare();
                             buffers_suffix<decltype(
                                 impl.rd_buf.data())> in(impl.rd_buf.data());
                             in.consume(impl.rd_buf.size() - bytes_transferred);
-                            impl.fs_.commit(asio::buffer_copy(
+                            impl.fr_.commit(asio::buffer_copy(
                                 asio::mutable_buffer(
                                     dest.data(),
                                     dest.size()),
                                 in));
-                            impl.fs_.read(uec);
+                            impl.fr_.read(uec);
                         }
                     }
                     if(impl.check_stop_now(ec))

include/boost/beast/websocket/impl/stream_impl.hpp

@@ -124,7 +124,7 @@ struct stream<NextLayer, deflateSupported>::impl_type
     detail::decorator       decorator_opt;  // Decorator for HTTP messages
     timeout                 timeout_opt;    // Timeout/idle settings
 
-    frame_reader fs_;
+    frame_reader fr_;
 
     template<class... Args>
     impl_type(Args&&... args)
@@ -135,7 +135,7 @@ struct stream<NextLayer, deflateSupported>::impl_type
             this->get_context(
                 this->boost::empty_value<NextLayer>::get().get_executor()))
         , timer(this->boost::empty_value<NextLayer>::get().get_executor())
-        , fs_(65536)
+        , fr_(65536)
     {
         timeout_opt.handshake_timeout = none();
         timeout_opt.idle_timeout = none();
@@ -182,7 +182,7 @@ struct stream<NextLayer, deflateSupported>::impl_type
 
         this->open_pmd(role);
 
-        fs_.reset(role);
+        fr_.reset(role);
     }
 
     void