boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-08-03 23:04:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix websocket stream when using net.ts executor type

Browse Source
This commit is contained in:
Richard Hodges
2020-07-03 07:57:00 +02:00
parent 060f59685c
commit 719f1a5505
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/boost/beast/websocket/impl/stream_impl.hpp
View File

@@ -128,8 +128,8 @@ struct stream<NextLayer, deflateSupported>::impl_type
boost::empty_init_t{}, boost::empty_init_t{},
std::forward<Args>(args)...) std::forward<Args>(args)...)
, detail::service::impl_type( , detail::service::impl_type(
net::query(this->boost::empty_value<NextLayer>::get().get_executor(), this->get_context(
net::execution::context)) this->boost::empty_value<NextLayer>::get().get_executor()))
, timer(this->boost::empty_value<NextLayer>::get().get_executor()) , timer(this->boost::empty_value<NextLayer>::get().get_executor())
{ {
timeout_opt.handshake_timeout = none(); timeout_opt.handshake_timeout = none();
@@ -477,6 +477,22 @@ struct stream<NextLayer, deflateSupported>::impl_type
} }
private: private:
template<class Executor>
static net::execution_context&
get_context(Executor const& ex,
typename std::enable_if< net::execution::is_executor<Executor>::value >::type* = 0)
{
return net::query(ex, net::execution::context);
}
template<class Executor>
static net::execution_context&
get_context(Executor const& ex,
typename std::enable_if< !net::execution::is_executor<Executor>::value >::type* = 0)
{
return ex.context();
}
bool bool
is_timer_set() const is_timer_set() const
{ {