Mercurial > irccd
changeset 842:0df3a4977bf9
plugin links: fix recent boost version
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Thu, 04 Jul 2019 21:00:00 +0200 |
| parents | 1399755352e7 |
| children | 497eca78800c |
| files | plugins/links/requester.cpp plugins/links/requester.hpp |
| diffstat | 2 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/links/requester.cpp Fri Jun 14 20:53:00 2019 +0200 +++ b/plugins/links/requester.cpp Thu Jul 04 21:00:00 2019 +0200 @@ -158,13 +158,12 @@ // Request again in case of relocation. if (const auto it = res_.find(field::location); it != res_.end() && level_ < 32U) { const string location(it->value().data(), it->value().size()); - auto& io = timer_.get_io_service(); auto uri = uri::parse(location); if (!uri) return; - shared_ptr<requester>(new requester(io, server_, channel_, origin_, move(*uri), level_ + 1))->start(); + shared_ptr<requester>(new requester(service_, server_, channel_, origin_, move(*uri), level_ + 1))->start(); } else if (res_.result() == status::ok) parse(); } @@ -328,10 +327,10 @@ void requester::start() { if (uri_.scheme == "http") - socket_.emplace<tcp::socket>(resolver_.get_io_service()); + socket_.emplace<tcp::socket>(service_); #if defined(IRCCD_HAVE_SSL) else if (uri_.scheme == "https") - socket_.emplace<stream<tcp::socket>>(resolver_.get_io_service(), ctx_); + socket_.emplace<stream<tcp::socket>>(service_, ctx_); #endif // Only do the resolve if scheme is correct. @@ -350,6 +349,7 @@ , channel_(move(channel)) , origin_(move(origin)) , uri_(move(uri)) + , service_(io) , timer_(io) , resolver_(io) {
--- a/plugins/links/requester.hpp Fri Jun 14 20:53:00 2019 +0200 +++ b/plugins/links/requester.hpp Thu Jul 04 21:00:00 2019 +0200 @@ -76,6 +76,7 @@ boost::beast::flat_buffer buffer_{163840}; boost::beast::http::request<boost::beast::http::empty_body> req_; boost::beast::http::response<boost::beast::http::string_body> res_; + boost::asio::io_service& service_; boost::asio::deadline_timer timer_; boost::asio::ip::tcp::resolver resolver_;