Squashed 'src/beast/' changes from c00cd37..06f74f0

06f74f0 Set version to 1.0.0-b26
68f535f Tidy up warnings and tests:
4ee5fa9 Set version to 1.0.0-b25
229d390 Update README.md for CppCast 2017
c3e3a55 Fix deflate setup bug
439a224 WebSocket server examples and test tidying:
29565c8 Remove unnecessary include
caa3b39 Fix 32-bit arm7 warnings
0474cc5 Better handler_ptr (API Change):
ca38657 Fixes for websocket echo server:
797631c Set version to 1.0.0-b24
a450968 Add permessage-deflate WebSocket extension:
67e965e Make decorator copyable
42899fc Add optional yield_to arguments
61aef03 Simplify Travis package install specification
9d0d7c9 bjam use clang on MACOSX

git-subtree-dir: src/beast
git-subtree-split: 06f74f05f7de51d7f791a17c2b06840183332cbe

include/beast/websocket/impl/stream.ipp

@@ -10,6 +10,7 @@
 
 #include <beast/websocket/teardown.hpp>
 #include <beast/websocket/detail/hybi13.hpp>
+#include <beast/websocket/detail/pmd_extension.hpp>
 #include <beast/http/read.hpp>
 #include <beast/http/write.hpp>
 #include <beast/http/reason.hpp>
@@ -25,6 +26,7 @@
 #include <boost/endian/buffers.hpp>
 #include <algorithm>
 #include <memory>
+#include <stdexcept>
 #include <utility>
 
 namespace beast {
@@ -38,6 +40,30 @@ stream(Args&&... args)
 {
 }
 
+template<class NextLayer>
+void
+stream<NextLayer>::
+set_option(permessage_deflate const& o)
+{
+    if( o.server_max_window_bits > 15 ||
+        o.server_max_window_bits < 9)
+        throw std::invalid_argument{
+            "invalid server_max_window_bits"};
+    if( o.client_max_window_bits > 15 ||
+        o.client_max_window_bits < 9)
+        throw std::invalid_argument{
+            "invalid client_max_window_bits"};
+    if( o.compLevel < 0 ||
+        o.compLevel > 9)
+        throw std::invalid_argument{
+            "invalid compLevel"};
+    if( o.memLevel < 1 ||
+        o.memLevel > 9)
+        throw std::invalid_argument{
+            "invalid memLevel"};
+    pmd_opts_ = o;
+}
+
 //------------------------------------------------------------------------------
 
 template<class NextLayer>
@@ -46,8 +72,7 @@ stream<NextLayer>::
 reset()
 {
     failed_ = false;
-    rd_need_ = 0;
-    rd_cont_ = false;
+    rd_.cont = false;
     wr_close_ = false;
     wr_.cont = false;
     wr_block_ = nullptr;    // should be nullptr on close anyway
@@ -72,7 +97,22 @@ build_request(boost::string_ref const& host,
     key = detail::make_sec_ws_key(maskgen_);
     req.fields.insert("Sec-WebSocket-Key", key);
     req.fields.insert("Sec-WebSocket-Version", "13");
-    (*d_)(req);
+    if(pmd_opts_.client_enable)
+    {
+        detail::pmd_offer config;
+        config.accept = true;
+        config.server_max_window_bits =
+            pmd_opts_.server_max_window_bits;
+        config.client_max_window_bits =
+            pmd_opts_.client_max_window_bits;
+        config.server_no_context_takeover =
+            pmd_opts_.server_no_context_takeover;
+        config.client_no_context_takeover =
+            pmd_opts_.client_no_context_takeover;
+        detail::pmd_write(
+            req.fields, config);
+    }
+    d_(req);
     http::prepare(req, http::connection::upgrade);
     return req;
 }
@@ -91,7 +131,7 @@ build_response(http::request<Body, Fields> const& req)
             res.reason = http::reason_string(res.status);
             res.version = req.version;
             res.body = text;
-            (*d_)(res);
+            d_(res);
             prepare(res,
                 (is_keep_alive(req) && keep_alive_) ?
                     http::connection::keep_alive :
@@ -122,6 +162,7 @@ build_response(http::request<Body, Fields> const& req)
             res.reason = http::reason_string(res.status);
             res.version = req.version;
             res.fields.insert("Sec-WebSocket-Version", "13");
+            d_(res);
             prepare(res,
                 (is_keep_alive(req) && keep_alive_) ?
                     http::connection::keep_alive :
@@ -130,6 +171,13 @@ build_response(http::request<Body, Fields> const& req)
         }
     }
     http::response<http::string_body> res;
+    {
+        detail::pmd_offer offer;
+        detail::pmd_offer unused;
+        pmd_read(offer, req.fields);
+        pmd_negotiate(
+            res.fields, unused, offer, pmd_opts_);
+    }
     res.status = 101;
     res.reason = http::reason_string(res.status);
     res.version = req.version;
@@ -141,7 +189,7 @@ build_response(http::request<Body, Fields> const& req)
             detail::make_sec_ws_accept(key));
     }
     res.fields.replace("Server", "Beast.WSProto");
-    (*d_)(res);
+    d_(res);
     http::prepare(res, http::connection::upgrade);
     return res;
 }
@@ -168,32 +216,14 @@ do_response(http::response<Body, Fields> const& res,
     if(res.fields["Sec-WebSocket-Accept"] !=
         detail::make_sec_ws_accept(key))
         return fail();
+    detail::pmd_offer offer;
+    pmd_read(offer, res.fields);
+    // VFALCO see if offer satisfies pmd_config_,
+    //        return an error if not.
+    pmd_config_ = offer; // overwrite for now
     open(detail::role_type::client);
 }
 
-template<class NextLayer>
-void
-stream<NextLayer>::
-do_read_fh(detail::frame_streambuf& fb,
-    close_code::value& code, error_code& ec)
-{
-    fb.commit(boost::asio::read(
-        stream_, fb.prepare(2), ec));
-    if(ec)
-        return;
-    auto const n = read_fh1(fb, code);
-    if(code != close_code::none)
-        return;
-    if(n > 0)
-    {
-        fb.commit(boost::asio::read(
-            stream_, fb.prepare(n), ec));
-        if(ec)
-            return;
-    }
-    read_fh2(fb, code);
-}
-
 } // websocket
 } // beast