feedc0de/boost_beast
1
0
Fork 0
forked from boostorg/beast
Code Pull Requests Activity

Refactor header status, reason, and target (API Change):

Browse Source 
* header::result is a family of functions to replace header::status

* header interface now uses status enum and also ints

* reason-phrase is no longer stored unless the user explicitly
  requests it.

* When serializing, the standard reason is used for the
  corresponding status code unless the user has changed it.
This commit is contained in:
Vinnie Falco
2017-06-04 17:26:20 -07:00
parent 60f044aff0
commit e67c0abe79
31 changed files with 588 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/beast/websocket/impl/accept.ipp
+2 -1
View File
@@ -148,7 +148,8 @@ operator()(error_code ec, bool again)
// sent response
case 1:
d.state = 99;
if(d.res.status != 101)
if(d.res.result() !=
http::status::switching_protocols)
ec = error::handshake_failed;
if(! ec)
{
include/beast/websocket/impl/stream.ipp
+5 -5
View File
@@ -112,7 +112,7 @@ do_accept(http::header<true, Fields> const& req,
http::write(stream_, res, ec);
if(ec)
return;
if(res.status != 101)
if(res.result() != http::status::switching_protocols)
{
ec = error::handshake_failed;
// VFALCO TODO Respect keep alive setting, perform
@@ -216,7 +216,7 @@ build_response(http::header<true, Fields> const& req,
[&](std::string const& text)
{
response_type res;
res.status = 400;
res.result(http::status::bad_request);
res.version = req.version;
res.body = text;
prepare(res);
@@ -246,7 +246,7 @@ build_response(http::header<true, Fields> const& req,
if(version != "13")
{
response_type res;
res.status = 426;
res.result(http::status::upgrade_required);
res.version = req.version;
res.fields.insert("Sec-WebSocket-Version", "13");
prepare(res);
@@ -263,7 +263,7 @@ build_response(http::header<true, Fields> const& req,
pmd_negotiate(
res.fields, unused, offer, pmd_opts_);
}
res.status = 101;
res.result(http::status::switching_protocols);
res.version = req.version;
res.fields.insert("Upgrade", "websocket");
res.fields.insert("Connection", "upgrade");
@@ -286,7 +286,7 @@ do_response(http::header<false> const& res,
{
if(res.version < 11)
return false;
if(res.status != 101)
if(res.result() != http::status::switching_protocols)
return false;
if(! is_upgrade(res))
return false;