# HG changeset patch # User David Demelier # Date 1562266800 -7200 # Node ID 0df3a4977bf91e7c06420848fbc078d8ea8153e3 # Parent 1399755352e73c9a2a2ba3d1a2eaf1a49e737c66 plugin links: fix recent boost version diff -r 1399755352e7 -r 0df3a4977bf9 plugins/links/requester.cpp --- 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(new requester(io, server_, channel_, origin_, move(*uri), level_ + 1))->start(); + shared_ptr(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(resolver_.get_io_service()); + socket_.emplace(service_); #if defined(IRCCD_HAVE_SSL) else if (uri_.scheme == "https") - socket_.emplace>(resolver_.get_io_service(), ctx_); + socket_.emplace>(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) { diff -r 1399755352e7 -r 0df3a4977bf9 plugins/links/requester.hpp --- 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 req_; boost::beast::http::response res_; + boost::asio::io_service& service_; boost::asio::deadline_timer timer_; boost::asio::ip::tcp::resolver resolver_;