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

Remove header_parser (API Change)

Browse Source
This commit is contained in:
Vinnie Falco
2017-07-20 08:12:18 -07:00
parent fa28cba515
commit 9f7abcbe2d
13 changed files with 58 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/beast/http/detail/type_traits.hpp
+9
View File
@@ -19,6 +19,9 @@ struct header;
template<bool, class, class>
struct message;
template<bool isRequest,class Body, class Fields>
class parser;
namespace detail {
template<class T>
@@ -35,6 +38,12 @@ public:
template<class T>
using is_header = typename is_header_impl<T>::type;
template<class T>
struct is_parser : std::false_type {};
template<bool isRequest, class Body, class Fields>
struct is_parser<parser<isRequest, Body, Fields>> : std::true_type {};
struct fields_model
{
string_view method() const;
include/beast/http/impl/parser.ipp
+1 -21
View File
@@ -14,15 +14,6 @@
namespace beast {
namespace http {
template<bool isRequest, class Fields>
template<class Arg0, class... ArgN, class>
header_parser<isRequest, Fields>::
header_parser(Arg0&& arg0, ArgN&&... argn)
: h_(std::forward<Arg0>(arg0),
std::forward<ArgN>(argn)...)
{
}
template<bool isRequest, class Body, class Fields>
template<class Arg1, class... ArgN, class>
parser<isRequest, Body, Fields>::
@@ -33,7 +24,7 @@ parser(Arg1&& arg1, ArgN&&... argn)
}
template<bool isRequest, class Body, class Fields>
template<class OtherBody, class... Args>
template<class OtherBody, class... Args, class>
parser<isRequest, Body, Fields>::
parser(parser<isRequest, OtherBody, Fields>&& parser,
Args&&... args)
@@ -46,17 +37,6 @@ parser(parser<isRequest, OtherBody, Fields>&& parser,
"moved-from parser has a body"});
}
template<bool isRequest, class Body, class Fields>
template<class... Args>
parser<isRequest, Body, Fields>::
parser(header_parser<
isRequest, Fields>&& parser, Args&&... args)
: base_type(std::move(static_cast<basic_parser<
isRequest, header_parser<isRequest, Fields>>&>(parser)))
, m_(parser.release(), std::forward<Args>(args)...)
{
}
} // http
} // beast
include/beast/http/parser.hpp
+8 -206
View File
@@ -20,199 +20,6 @@
namespace beast {
namespace http {
/** An HTTP/1 parser for producing a header.
This class uses the basic HTTP/1 wire format parser to convert
a series of octets into a @ref header.
@note A new instance of the parser is required for each message.
@tparam isRequest Indicates whether a request or response
will be parsed.
@tparam Fields The type of container used to represent the fields.
*/
template<bool isRequest, class Fields>
class header_parser
: public basic_parser<isRequest,
header_parser<isRequest, Fields>>
{
header<isRequest, Fields> h_;
string_view body_;
public:
/// The type of @ref header this object produces.
using value_type = header<isRequest, Fields>;
/// Default constructor.
header_parser() = default;
/// Copy constructor.
header_parser(header_parser const&) = default;
/// Copy assignment.
header_parser& operator=(header_parser const&) = default;
/** Move constructor.
After the move, the only valid operation
on the moved-from object is destruction.
*/
header_parser(header_parser&&) = default;
/** Move assignment
After the move, the only valid operation
on the moved-from object is destruction.
*/
header_parser& operator=(header_parser&&) = default;
/** Constructor
@param args Optional arguments forwarded
forwarded to the @ref http::header constructor.
*/
#if BEAST_DOXYGEN
template<class... Args>
explicit
header_parser(Args&&... args);
#else
template<class Arg0, class... ArgN,
class = typename std::enable_if<
! std::is_convertible<typename
std::decay<Arg0>::type,
header_parser>::value>>
explicit
header_parser(Arg0&& arg0, ArgN&&... argn);
#endif
/** Returns parsed body octets.
This function will return the most recent buffer
of octets corresponding to the parsed body. This
buffer will become invalidated on any subsequent
call to @ref put or @ref put_eof
*/
string_view
body() const
{
return body_;
}
/** Returns the parsed header
@note The return value is undefined unless
@ref is_header_done would return `true`.
*/
value_type const&
get() const
{
return h_;
}
/** Returns the parsed header.
@note The return value is undefined unless
@ref is_header_done would return `true`.
*/
value_type&
get()
{
return h_;
}
/** Returns ownership of the parsed header.
Ownership is transferred to the caller.
@note The return value is undefined unless
@ref is_header_done would return `true`.
Requires:
@ref value_type is @b MoveConstructible
*/
value_type
release()
{
static_assert(
std::is_move_constructible<decltype(h_)>::value,
"MoveConstructible requirements not met");
return std::move(h_);
}
private:
friend class basic_parser<isRequest, header_parser>;
void
on_request(string_view method,
string_view path, int version, error_code&)
{
h_.target(path);
h_.method(method);
h_.version = version;
}
void
on_response(int code, string_view reason,
int version, error_code&)
{
h_.result(code);
h_.version = version;
h_.reason(reason);
}
void
on_field(string_view name,
string_view value, error_code&)
{
h_.fields.insert(name, value);
}
void
on_header(error_code&)
{
}
void
on_body(boost::optional<std::
uint64_t> const&, error_code&)
{
}
void
on_data(string_view s, error_code&)
{
body_ = s;
}
void
on_chunk(std::uint64_t,
string_view, error_code&)
{
body_ = {};
}
void
on_complete(error_code&)
{
body_ = {};
}
};
template<
bool isRequest,class Body, class Fields = fields>
class parser;
namespace detail {
template<class T>
struct is_parser : std::false_type {};
template<bool isRequest, class Body, class Fields>
struct is_parser<parser<isRequest, Body, Fields>> : std::true_type {};
} // detail
/** An HTTP/1 parser for producing a message.
This class uses the basic HTTP/1 wire format parser to convert
@@ -227,7 +34,10 @@ struct is_parser<parser<isRequest, Body, Fields>> : std::true_type {};
@note A new instance of the parser is required for each message.
*/
template<bool isRequest, class Body, class Fields>
template<
bool isRequest,
class Body,
class Fields = fields>
class parser
: public basic_parser<isRequest,
parser<isRequest, Body, Fields>>
@@ -265,7 +75,7 @@ public:
After the move, the only valid operation
on the moved-from object is destruction.
*/
parser(parser&& other);
parser(parser&& other) = default;
/** Constructor
@@ -320,22 +130,14 @@ public:
#if BEAST_DOXYGEN
template<class OtherBody, class... Args>
#else
template<class OtherBody, class... Args>
template<class OtherBody, class... Args,
class = typename std::enable_if<
! std::is_same<Body, OtherBody>::value>::type>
#endif
explicit
parser(parser<isRequest, OtherBody, Fields>&& parser,
Args&&... args);
/** Construct a parser from a @ref header_parser.
@param parser The header parser to construct from.
@param args Optional arguments forwarded to the message
constructor.
*/
template<class... Args>
explicit
parser(header_parser<
isRequest, Fields>&& parser, Args&&... args);
/** Returns the parsed message.
Depending on the progress of the parser, portions
include/beast/websocket/impl/accept.ipp
+26 -33
View File
@@ -173,19 +173,15 @@ class stream<NextLayer>::accept_op
{
struct data
{
bool cont;
stream<NextLayer>& ws;
Decorator decorator;
http::header_parser<true, http::fields> p;
int state = 0;
http::request_parser<http::empty_body> p;
data(Handler& handler, stream<NextLayer>& ws_,
Decorator const& decorator_)
: ws(ws_)
, decorator(decorator_)
{
using boost::asio::asio_handler_is_continuation;
cont = asio_handler_is_continuation(std::addressof(handler));
}
template<class Buffers>
@@ -195,8 +191,6 @@ class stream<NextLayer>::accept_op
: ws(ws_)
, decorator(decorator_)
{
using boost::asio::asio_handler_is_continuation;
cont = asio_handler_is_continuation(std::addressof(handler));
using boost::asio::buffer_copy;
using boost::asio::buffer_size;
// VFALCO What about catch(std::length_error const&)?
@@ -218,11 +212,11 @@ public:
: d_(std::forward<DeducedHandler>(h),
ws, std::forward<Args>(args)...)
{
(*this)(error_code{}, 0, false);
}
void operator()(error_code ec,
std::size_t bytes_used, bool again = true);
void operator()();
void operator()(error_code ec);
friend
void* asio_handler_allocate(
@@ -245,7 +239,9 @@ public:
friend
bool asio_handler_is_continuation(accept_op* op)
{
return op->d_->cont;
using boost::asio::asio_handler_is_continuation;
return asio_handler_is_continuation(
std::addressof(op->d_.handler()));
}
template<class Function>
@@ -262,27 +258,24 @@ template<class NextLayer>
template<class Decorator, class Handler>
void
stream<NextLayer>::accept_op<Decorator, Handler>::
operator()(error_code ec,
std::size_t bytes_used, bool again)
operator()()
{
auto& d = *d_;
d.cont = d.cont || again;
if(ec)
goto upcall;
switch(d.state)
{
case 0:
// read message
d.state = 1;
http::async_read_some(d.ws.next_layer(),
d.ws.stream_.buffer(), d.p,
std::move(*this));
return;
http::async_read_header(d.ws.next_layer(),
d.ws.stream_.buffer(), d.p,
std::move(*this));
}
case 1:
template<class NextLayer>
template<class Decorator, class Handler>
void
stream<NextLayer>::accept_op<Decorator, Handler>::
operator()(error_code ec)
{
auto& d = *d_;
if(! ec)
{
BOOST_ASSERT(d.p.is_header_done());
d.ws.stream_.buffer().consume(bytes_used);
// Arguments from our state must be
// moved to the stack before releasing
// the handler.
@@ -302,8 +295,6 @@ operator()(error_code ec,
#endif
return;
}
}
upcall:
d_.invoke(ec);
}
@@ -619,7 +610,7 @@ async_accept(AcceptHandler&& handler)
reset();
accept_op<decltype(&default_decorate_res),
handler_type<AcceptHandler, void(error_code)>>{
init.completion_handler, *this, &default_decorate_res};
init.completion_handler, *this, &default_decorate_res}();
return init.result.get();
}
@@ -641,7 +632,7 @@ async_accept_ex(ResponseDecorator const& decorator,
reset();
accept_op<ResponseDecorator, handler_type<
AcceptHandler, void(error_code)>>{
init.completion_handler, *this, decorator};
init.completion_handler, *this, decorator}();
return init.result.get();
}
@@ -664,7 +655,8 @@ async_accept(ConstBufferSequence const& buffers,
reset();
accept_op<decltype(&default_decorate_res),
handler_type<AcceptHandler, void(error_code)>>{
init.completion_handler, *this, buffers, &default_decorate_res};
init.completion_handler, *this, buffers,
&default_decorate_res}();
return init.result.get();
}
@@ -692,7 +684,8 @@ async_accept_ex(ConstBufferSequence const& buffers,
reset();
accept_op<ResponseDecorator, handler_type<
AcceptHandler, void(error_code)>>{
init.completion_handler, *this, buffers, decorator};
init.completion_handler, *this, buffers,
decorator}();
return init.result.get();
}
include/beast/websocket/impl/stream.ipp
+3 -5
View File
@@ -91,13 +91,11 @@ stream<NextLayer>::
do_accept(
Decorator const& decorator, error_code& ec)
{
http::header_parser<true, http::fields> p;
auto const bytes_used = http::read_some(
next_layer(), stream_.buffer(), p, ec);
http::request_parser<http::empty_body> p;
http::read_header(next_layer(),
stream_.buffer(), p, ec);
if(ec)
return;
BOOST_ASSERT(p.is_header_done());
stream_.buffer().consume(bytes_used);
do_accept(p.get(), decorator, ec);
}
include/beast/websocket/stream.hpp
+2 -4
View File
@@ -30,12 +30,10 @@ namespace beast {
namespace websocket {
/// The type of object holding HTTP Upgrade requests
using request_type =
http::message<true, http::empty_body, http::fields>;
using request_type = http::request<http::empty_body>;
/// The type of object holding HTTP Upgrade responses
using response_type =
http::message<false, http::string_body, http::fields>;
using response_type = http::response<http::string_body>;
/** Information about a WebSocket frame.