mirror of
https://github.com/Xahau/xahaud.git
synced 2025-12-06 17:27:52 +00:00
Squashed 'src/beast/' changes from 06f74f0..9f10b11
9f10b11 Set version to 1.0.0-b28 195f974 Fix HTTP split parse edge case: 264fd41 Restyle async result constructions 572a0eb Split out and rename test stream classes 95b6646 Tidy up some WebSocket javadocs f6938d3 Set version to 1.0.0-b27 a6120cd Update copyright dates c7bfe7d Add documentation building instructions f6c91ce Tidy up tests and docs: f03985f Move basic_streambuf to streambuf.hpp (API Change): b8639a7 Invoke callback on pings and pongs (API Change): git-subtree-dir: src/beast git-subtree-split: 9f10b11eff58aeb793b673c8a8cb6e2bee3db621
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
//
|
||||
// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
|
||||
// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
|
||||
//
|
||||
// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
||||
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
//
|
||||
// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
|
||||
// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
|
||||
//
|
||||
// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
||||
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
@@ -45,6 +45,7 @@ namespace http {
|
||||
template<bool isRequest, class Derived>
|
||||
basic_parser_v1<isRequest, Derived>::
|
||||
basic_parser_v1()
|
||||
: flags_(0)
|
||||
{
|
||||
init();
|
||||
}
|
||||
@@ -61,12 +62,12 @@ basic_parser_v1(basic_parser_v1<
|
||||
, content_length_(other.content_length_)
|
||||
, cb_(nullptr)
|
||||
, s_(other.s_)
|
||||
, flags_(other.flags_)
|
||||
, fs_(other.fs_)
|
||||
, pos_(other.pos_)
|
||||
, http_major_(other.http_major_)
|
||||
, http_minor_(other.http_minor_)
|
||||
, status_code_(other.status_code_)
|
||||
, flags_(other.flags_)
|
||||
, upgrade_(other.upgrade_)
|
||||
{
|
||||
BOOST_ASSERT(! other.cb_);
|
||||
@@ -88,13 +89,14 @@ operator=(basic_parser_v1<
|
||||
content_length_ = other.content_length_;
|
||||
cb_ = nullptr;
|
||||
s_ = other.s_;
|
||||
flags_ = other.flags_;
|
||||
fs_ = other.fs_;
|
||||
pos_ = other.pos_;
|
||||
http_major_ = other.http_major_;
|
||||
http_minor_ = other.http_minor_;
|
||||
status_code_ = other.status_code_;
|
||||
flags_ = other.flags_;
|
||||
upgrade_ = other.upgrade_;
|
||||
flags_ &= ~parse_flag::paused;
|
||||
return *this;
|
||||
}
|
||||
|
||||
@@ -581,7 +583,7 @@ write(boost::asio::const_buffer const& buffer, error_code& ec)
|
||||
field-value = *( field-content / obs-fold )
|
||||
field-content = field-vchar [ 1*( SP / HTAB ) field-vchar ]
|
||||
field-vchar = VCHAR / obs-text
|
||||
obs-fold = CRLF 1*( SP / HTAB )
|
||||
obs-fold = CRLF 1*( SP / HTAB )
|
||||
; obsolete line folding
|
||||
*/
|
||||
case s_header_value0:
|
||||
@@ -880,7 +882,7 @@ write(boost::asio::const_buffer const& buffer, error_code& ec)
|
||||
case h_connection_keep_alive:
|
||||
fs_ = h_connection_keep_alive_ows;
|
||||
break;
|
||||
|
||||
|
||||
case h_connection_upgrade:
|
||||
fs_ = h_connection_upgrade_ows;
|
||||
break;
|
||||
@@ -966,6 +968,7 @@ write(boost::asio::const_buffer const& buffer, error_code& ec)
|
||||
case body_what::pause:
|
||||
++p;
|
||||
s_ = s_body_pause;
|
||||
flags_ |= parse_flag::paused;
|
||||
return used();
|
||||
}
|
||||
s_ = s_headers_done;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
//
|
||||
// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
|
||||
// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
|
||||
//
|
||||
// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
||||
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
//
|
||||
// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
|
||||
// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
|
||||
//
|
||||
// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
||||
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
@@ -143,7 +143,7 @@ operator()(error_code ec, std::size_t bytes_transferred, bool again)
|
||||
{
|
||||
// read
|
||||
d.state = 2;
|
||||
auto const size =
|
||||
auto const size =
|
||||
read_size_helper(d.db, 65536);
|
||||
BOOST_ASSERT(size > 0);
|
||||
d.s.async_read_some(
|
||||
@@ -289,7 +289,7 @@ async_parse(AsyncReadStream& stream,
|
||||
static_assert(is_Parser<Parser>::value,
|
||||
"Parser requirements not met");
|
||||
beast::async_completion<ReadHandler,
|
||||
void(error_code)> completion(handler);
|
||||
void(error_code)> completion{handler};
|
||||
detail::parse_op<AsyncReadStream, DynamicBuffer,
|
||||
Parser, decltype(completion.handler)>{
|
||||
completion.handler, stream, dynabuf, parser};
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
//
|
||||
// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
|
||||
// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
|
||||
//
|
||||
// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
||||
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
//
|
||||
// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
|
||||
// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
|
||||
//
|
||||
// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
||||
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
@@ -183,7 +183,7 @@ async_read(AsyncReadStream& stream, DynamicBuffer& dynabuf,
|
||||
static_assert(is_DynamicBuffer<DynamicBuffer>::value,
|
||||
"DynamicBuffer requirements not met");
|
||||
beast::async_completion<ReadHandler,
|
||||
void(error_code)> completion(handler);
|
||||
void(error_code)> completion{handler};
|
||||
detail::read_header_op<AsyncReadStream, DynamicBuffer,
|
||||
isRequest, Fields, decltype(
|
||||
completion.handler)>{completion.handler,
|
||||
@@ -375,7 +375,7 @@ async_read(AsyncReadStream& stream, DynamicBuffer& dynabuf,
|
||||
message<isRequest, Body, Fields>>::value,
|
||||
"Reader requirements not met");
|
||||
beast::async_completion<ReadHandler,
|
||||
void(error_code)> completion(handler);
|
||||
void(error_code)> completion{handler};
|
||||
detail::read_op<AsyncReadStream, DynamicBuffer,
|
||||
isRequest, Body, Fields, decltype(
|
||||
completion.handler)>{completion.handler,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
//
|
||||
// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
|
||||
// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
|
||||
//
|
||||
// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
||||
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
//
|
||||
// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
|
||||
// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
|
||||
//
|
||||
// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
||||
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
@@ -234,7 +234,7 @@ async_write(AsyncWriteStream& stream,
|
||||
static_assert(is_AsyncWriteStream<AsyncWriteStream>::value,
|
||||
"AsyncWriteStream requirements not met");
|
||||
beast::async_completion<WriteHandler,
|
||||
void(error_code)> completion(handler);
|
||||
void(error_code)> completion{handler};
|
||||
streambuf sb;
|
||||
detail::write_start_line(sb, msg);
|
||||
detail::write_fields(sb, msg.fields);
|
||||
@@ -278,7 +278,7 @@ struct write_preparation
|
||||
w.init(ec);
|
||||
if(ec)
|
||||
return;
|
||||
|
||||
|
||||
write_start_line(sb, msg);
|
||||
write_fields(sb, msg.fields);
|
||||
beast::write(sb, "\r\n");
|
||||
@@ -728,7 +728,7 @@ async_write(AsyncWriteStream& stream,
|
||||
message<isRequest, Body, Fields>>::value,
|
||||
"Writer requirements not met");
|
||||
beast::async_completion<WriteHandler,
|
||||
void(error_code)> completion(handler);
|
||||
void(error_code)> completion{handler};
|
||||
detail::write_op<AsyncWriteStream, decltype(completion.handler),
|
||||
isRequest, Body, Fields>{completion.handler, stream, msg};
|
||||
return completion.result.get();
|
||||
|
||||
Reference in New Issue
Block a user