passenger 6.0.15 → 6.0.17

data/src/cxx_supportlib/vendor-modified/boost/asio/basic_signal_set.hpp

@@ -334,7 +334,7 @@ public:
   }
 
   /// Get the executor associated with the object.
-  executor_type get_executor() BOOST_ASIO_NOEXCEPT
+  const executor_type& get_executor() BOOST_ASIO_NOEXCEPT
   {
     return impl_.get_executor();
   }
@@ -567,7 +567,7 @@ private:
     {
     }
 
-    executor_type get_executor() const BOOST_ASIO_NOEXCEPT
+    const executor_type& get_executor() const BOOST_ASIO_NOEXCEPT
     {
       return self_->get_executor();
     }

data/src/cxx_supportlib/vendor-modified/boost/asio/basic_socket.hpp

@@ -374,7 +374,7 @@ public:
 #endif // defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
 
   /// Get the executor associated with the object.
-  executor_type get_executor() BOOST_ASIO_NOEXCEPT
+  const executor_type& get_executor() BOOST_ASIO_NOEXCEPT
   {
     return impl_.get_executor();
   }
@@ -1875,7 +1875,7 @@ private:
     {
     }
 
-    executor_type get_executor() const BOOST_ASIO_NOEXCEPT
+    const executor_type& get_executor() const BOOST_ASIO_NOEXCEPT
     {
       return self_->get_executor();
     }
@@ -1918,7 +1918,7 @@ private:
     {
     }
 
-    executor_type get_executor() const BOOST_ASIO_NOEXCEPT
+    const executor_type& get_executor() const BOOST_ASIO_NOEXCEPT
     {
       return self_->get_executor();
     }

data/src/cxx_supportlib/vendor-modified/boost/asio/basic_socket_acceptor.hpp

@@ -455,7 +455,7 @@ public:
   }
 
   /// Get the executor associated with the object.
-  executor_type get_executor() BOOST_ASIO_NOEXCEPT
+  const executor_type& get_executor() BOOST_ASIO_NOEXCEPT
   {
     return impl_.get_executor();
   }
@@ -2640,7 +2640,7 @@ private:
     {
     }
 
-    executor_type get_executor() const BOOST_ASIO_NOEXCEPT
+    const executor_type& get_executor() const BOOST_ASIO_NOEXCEPT
     {
       return self_->get_executor();
     }
@@ -2672,7 +2672,7 @@ private:
     {
     }
 
-    executor_type get_executor() const BOOST_ASIO_NOEXCEPT
+    const executor_type& get_executor() const BOOST_ASIO_NOEXCEPT
     {
       return self_->get_executor();
     }
@@ -2706,7 +2706,7 @@ private:
     {
     }
 
-    executor_type get_executor() const BOOST_ASIO_NOEXCEPT
+    const executor_type& get_executor() const BOOST_ASIO_NOEXCEPT
     {
       return self_->get_executor();
     }

data/src/cxx_supportlib/vendor-modified/boost/asio/basic_stream_file.hpp

@@ -688,7 +688,7 @@ private:
     {
     }
 
-    executor_type get_executor() const BOOST_ASIO_NOEXCEPT
+    const executor_type& get_executor() const BOOST_ASIO_NOEXCEPT
     {
       return self_->get_executor();
     }
@@ -721,7 +721,7 @@ private:
     {
     }
 
-    executor_type get_executor() const BOOST_ASIO_NOEXCEPT
+    const executor_type& get_executor() const BOOST_ASIO_NOEXCEPT
     {
       return self_->get_executor();
     }

data/src/cxx_supportlib/vendor-modified/boost/asio/basic_stream_socket.hpp

@@ -1124,7 +1124,7 @@ private:
     {
     }
 
-    executor_type get_executor() const BOOST_ASIO_NOEXCEPT
+    const executor_type& get_executor() const BOOST_ASIO_NOEXCEPT
     {
       return self_->get_executor();
     }
@@ -1158,7 +1158,7 @@ private:
     {
     }
 
-    executor_type get_executor() const BOOST_ASIO_NOEXCEPT
+    const executor_type& get_executor() const BOOST_ASIO_NOEXCEPT
     {
       return self_->get_executor();
     }

data/src/cxx_supportlib/vendor-modified/boost/asio/basic_waitable_timer.hpp

@@ -382,7 +382,7 @@ public:
   }
 
   /// Get the executor associated with the object.
-  executor_type get_executor() BOOST_ASIO_NOEXCEPT
+  const executor_type& get_executor() BOOST_ASIO_NOEXCEPT
   {
     return impl_.get_executor();
   }
@@ -799,7 +799,7 @@ private:
     {
     }
 
-    executor_type get_executor() const BOOST_ASIO_NOEXCEPT
+    const executor_type& get_executor() const BOOST_ASIO_NOEXCEPT
     {
       return self_->get_executor();
     }

data/src/cxx_supportlib/vendor-modified/boost/asio/basic_writable_pipe.hpp

@@ -264,7 +264,7 @@ public:
   }
 
   /// Get the executor associated with the object.
-  executor_type get_executor() BOOST_ASIO_NOEXCEPT
+  const executor_type& get_executor() BOOST_ASIO_NOEXCEPT
   {
     return impl_.get_executor();
   }
@@ -590,7 +590,7 @@ private:
     {
     }
 
-    executor_type get_executor() const BOOST_ASIO_NOEXCEPT
+    const executor_type& get_executor() const BOOST_ASIO_NOEXCEPT
     {
       return self_->get_executor();
     }

data/src/cxx_supportlib/vendor-modified/boost/asio/bind_allocator.hpp

@@ -693,8 +693,16 @@ struct associator<Associator,
 {
   typedef typename Associator<T, DefaultCandidate>::type type;
 
-  static type get(const allocator_binder<T, Allocator>& b,
-      const DefaultCandidate& c = DefaultCandidate()) BOOST_ASIO_NOEXCEPT
+  static type get(const allocator_binder<T, Allocator>& b) BOOST_ASIO_NOEXCEPT
+  {
+    return Associator<T, DefaultCandidate>::get(b.get());
+  }
+
+  static BOOST_ASIO_AUTO_RETURN_TYPE_PREFIX(type) get(
+      const allocator_binder<T, Allocator>& b,
+      const DefaultCandidate& c) BOOST_ASIO_NOEXCEPT
+    BOOST_ASIO_AUTO_RETURN_TYPE_SUFFIX((
+      Associator<T, DefaultCandidate>::get(b.get(), c)))
   {
     return Associator<T, DefaultCandidate>::get(b.get(), c);
   }
@@ -707,8 +715,10 @@ struct associated_allocator<
 {
   typedef Allocator type;
 
-  static type get(const allocator_binder<T, Allocator>& b,
+  static BOOST_ASIO_AUTO_RETURN_TYPE_PREFIX(type) get(
+      const allocator_binder<T, Allocator>& b,
       const Allocator1& = Allocator1()) BOOST_ASIO_NOEXCEPT
+    BOOST_ASIO_AUTO_RETURN_TYPE_SUFFIX((b.get_allocator()))
   {
     return b.get_allocator();
   }

data/src/cxx_supportlib/vendor-modified/boost/asio/bind_cancellation_slot.hpp

@@ -695,8 +695,17 @@ struct associator<Associator,
 {
   typedef typename Associator<T, DefaultCandidate>::type type;
 
-  static type get(const cancellation_slot_binder<T, CancellationSlot>& b,
-      const DefaultCandidate& c = DefaultCandidate()) BOOST_ASIO_NOEXCEPT
+  static type get(const cancellation_slot_binder<T, CancellationSlot>& b)
+    BOOST_ASIO_NOEXCEPT
+  {
+    return Associator<T, DefaultCandidate>::get(b.get());
+  }
+
+  static BOOST_ASIO_AUTO_RETURN_TYPE_PREFIX(type) get(
+      const cancellation_slot_binder<T, CancellationSlot>& b,
+      const DefaultCandidate& c) BOOST_ASIO_NOEXCEPT
+    BOOST_ASIO_AUTO_RETURN_TYPE_SUFFIX((
+      Associator<T, DefaultCandidate>::get(b.get(), c)))
   {
     return Associator<T, DefaultCandidate>::get(b.get(), c);
   }
@@ -709,8 +718,10 @@ struct associated_cancellation_slot<
 {
   typedef CancellationSlot type;
 
-  static type get(const cancellation_slot_binder<T, CancellationSlot>& b,
+  static BOOST_ASIO_AUTO_RETURN_TYPE_PREFIX(type) get(
+      const cancellation_slot_binder<T, CancellationSlot>& b,
       const CancellationSlot1& = CancellationSlot1()) BOOST_ASIO_NOEXCEPT
+    BOOST_ASIO_AUTO_RETURN_TYPE_SUFFIX((b.get_cancellation_slot()))
   {
     return b.get_cancellation_slot();
   }

data/src/cxx_supportlib/vendor-modified/boost/asio/bind_executor.hpp

@@ -743,8 +743,16 @@ struct associator<Associator, executor_binder<T, Executor>, DefaultCandidate>
 {
   typedef typename Associator<T, DefaultCandidate>::type type;
 
-  static type get(const executor_binder<T, Executor>& b,
-      const DefaultCandidate& c = DefaultCandidate()) BOOST_ASIO_NOEXCEPT
+  static type get(const executor_binder<T, Executor>& b) BOOST_ASIO_NOEXCEPT
+  {
+    return Associator<T, DefaultCandidate>::get(b.get());
+  }
+
+  static BOOST_ASIO_AUTO_RETURN_TYPE_PREFIX(type) get(
+      const executor_binder<T, Executor>& b,
+      const DefaultCandidate& c) BOOST_ASIO_NOEXCEPT
+    BOOST_ASIO_AUTO_RETURN_TYPE_SUFFIX((
+      Associator<T, DefaultCandidate>::get(b.get(), c)))
   {
     return Associator<T, DefaultCandidate>::get(b.get(), c);
   }
@@ -755,8 +763,10 @@ struct associated_executor<executor_binder<T, Executor>, Executor1>
 {
   typedef Executor type;
 
-  static type get(const executor_binder<T, Executor>& b,
+  static BOOST_ASIO_AUTO_RETURN_TYPE_PREFIX(type) get(
+      const executor_binder<T, Executor>& b,
       const Executor1& = Executor1()) BOOST_ASIO_NOEXCEPT
+    BOOST_ASIO_AUTO_RETURN_TYPE_SUFFIX((b.get_executor()))
   {
     return b.get_executor();
   }

data/src/cxx_supportlib/vendor-modified/boost/asio/compose.hpp

@@ -19,16 +19,12 @@
 #include <boost/asio/associated_executor.hpp>
 #include <boost/asio/async_result.hpp>
 #include <boost/asio/detail/base_from_cancellation_state.hpp>
+#include <boost/asio/detail/composed_work.hpp>
 #include <boost/asio/detail/handler_alloc_helpers.hpp>
 #include <boost/asio/detail/handler_cont_helpers.hpp>
 #include <boost/asio/detail/handler_invoke_helpers.hpp>
 #include <boost/asio/detail/type_traits.hpp>
 #include <boost/asio/detail/variadic_templates.hpp>
-#include <boost/asio/execution/executor.hpp>
-#include <boost/asio/execution/outstanding_work.hpp>
-#include <boost/asio/executor_work_guard.hpp>
-#include <boost/asio/is_executor.hpp>
-#include <boost/asio/system_executor.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
@@ -36,274 +32,6 @@ namespace boost {
 namespace asio {
 namespace detail {
 
-template <typename Executor, typename = void>
-class composed_work_guard
-{
-public:
-  typedef typename decay<
-      typename prefer_result<Executor,
-        execution::outstanding_work_t::tracked_t
-      >::type
-    >::type executor_type;
-
-  composed_work_guard(const Executor& ex)
-    : executor_(boost::asio::prefer(ex, execution::outstanding_work.tracked))
-  {
-  }
-
-  void reset()
-  {
-  }
-
-  executor_type get_executor() const BOOST_ASIO_NOEXCEPT
-  {
-    return executor_;
-  }
-
-private:
-  executor_type executor_;
-};
-
-template <>
-struct composed_work_guard<system_executor>
-{
-public:
-  typedef system_executor executor_type;
-
-  composed_work_guard(const system_executor&)
-  {
-  }
-
-  void reset()
-  {
-  }
-
-  executor_type get_executor() const BOOST_ASIO_NOEXCEPT
-  {
-    return system_executor();
-  }
-};
-
-#if !defined(BOOST_ASIO_NO_TS_EXECUTORS)
-
-template <typename Executor>
-struct composed_work_guard<Executor,
-    typename enable_if<
-      !execution::is_executor<Executor>::value
-    >::type> : executor_work_guard<Executor>
-{
-  composed_work_guard(const Executor& ex)
-    : executor_work_guard<Executor>(ex)
-  {
-  }
-};
-
-#endif // !defined(BOOST_ASIO_NO_TS_EXECUTORS)
-
-template <typename>
-struct composed_io_executors;
-
-template <>
-struct composed_io_executors<void()>
-{
-  composed_io_executors() BOOST_ASIO_NOEXCEPT
-    : head_(system_executor())
-  {
-  }
-
-  typedef system_executor head_type;
-  system_executor head_;
-};
-
-inline composed_io_executors<void()> make_composed_io_executors()
-{
-  return composed_io_executors<void()>();
-}
-
-template <typename Head>
-struct composed_io_executors<void(Head)>
-{
-  explicit composed_io_executors(const Head& ex) BOOST_ASIO_NOEXCEPT
-    : head_(ex)
-  {
-  }
-
-  typedef Head head_type;
-  Head head_;
-};
-
-template <typename Head>
-inline composed_io_executors<void(Head)>
-make_composed_io_executors(const Head& head)
-{
-  return composed_io_executors<void(Head)>(head);
-}
-
-#if defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)
-
-template <typename Head, typename... Tail>
-struct composed_io_executors<void(Head, Tail...)>
-{
-  explicit composed_io_executors(const Head& head,
-      const Tail&... tail) BOOST_ASIO_NOEXCEPT
-    : head_(head),
-      tail_(tail...)
-  {
-  }
-
-  void reset()
-  {
-    head_.reset();
-    tail_.reset();
-  }
-
-  typedef Head head_type;
-  Head head_;
-  composed_io_executors<void(Tail...)> tail_;
-};
-
-template <typename Head, typename... Tail>
-inline composed_io_executors<void(Head, Tail...)>
-make_composed_io_executors(const Head& head, const Tail&... tail)
-{
-  return composed_io_executors<void(Head, Tail...)>(head, tail...);
-}
-
-#else // defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)
-
-#define BOOST_ASIO_PRIVATE_COMPOSED_IO_EXECUTORS_DEF(n) \
-template <typename Head, BOOST_ASIO_VARIADIC_TPARAMS(n)> \
-struct composed_io_executors<void(Head, BOOST_ASIO_VARIADIC_TARGS(n))> \
-{ \
-  explicit composed_io_executors(const Head& head, \
-      BOOST_ASIO_VARIADIC_CONSTREF_PARAMS(n)) BOOST_ASIO_NOEXCEPT \
-    : head_(head), \
-      tail_(BOOST_ASIO_VARIADIC_BYVAL_ARGS(n)) \
-  { \
-  } \
-\
-  void reset() \
-  { \
-    head_.reset(); \
-    tail_.reset(); \
-  } \
-\
-  typedef Head head_type; \
-  Head head_; \
-  composed_io_executors<void(BOOST_ASIO_VARIADIC_TARGS(n))> tail_; \
-}; \
-\
-template <typename Head, BOOST_ASIO_VARIADIC_TPARAMS(n)> \
-inline composed_io_executors<void(Head, BOOST_ASIO_VARIADIC_TARGS(n))> \
-make_composed_io_executors(const Head& head, \
-    BOOST_ASIO_VARIADIC_CONSTREF_PARAMS(n)) \
-{ \
-  return composed_io_executors< \
-    void(Head, BOOST_ASIO_VARIADIC_TARGS(n))>( \
-      head, BOOST_ASIO_VARIADIC_BYVAL_ARGS(n)); \
-} \
-/**/
-BOOST_ASIO_VARIADIC_GENERATE(BOOST_ASIO_PRIVATE_COMPOSED_IO_EXECUTORS_DEF)
-#undef BOOST_ASIO_PRIVATE_COMPOSED_IO_EXECUTORS_DEF
-
-#endif // defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)
-
-template <typename>
-struct composed_work;
-
-template <>
-struct composed_work<void()>
-{
-  typedef composed_io_executors<void()> executors_type;
-
-  composed_work(const executors_type&) BOOST_ASIO_NOEXCEPT
-    : head_(system_executor())
-  {
-  }
-
-  void reset()
-  {
-    head_.reset();
-  }
-
-  typedef system_executor head_type;
-  composed_work_guard<system_executor> head_;
-};
-
-template <typename Head>
-struct composed_work<void(Head)>
-{
-  typedef composed_io_executors<void(Head)> executors_type;
-
-  explicit composed_work(const executors_type& ex) BOOST_ASIO_NOEXCEPT
-    : head_(ex.head_)
-  {
-  }
-
-  void reset()
-  {
-    head_.reset();
-  }
-
-  typedef Head head_type;
-  composed_work_guard<Head> head_;
-};
-
-#if defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)
-
-template <typename Head, typename... Tail>
-struct composed_work<void(Head, Tail...)>
-{
-  typedef composed_io_executors<void(Head, Tail...)> executors_type;
-
-  explicit composed_work(const executors_type& ex) BOOST_ASIO_NOEXCEPT
-    : head_(ex.head_),
-      tail_(ex.tail_)
-  {
-  }
-
-  void reset()
-  {
-    head_.reset();
-    tail_.reset();
-  }
-
-  typedef Head head_type;
-  composed_work_guard<Head> head_;
-  composed_work<void(Tail...)> tail_;
-};
-
-#else // defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)
-
-#define BOOST_ASIO_PRIVATE_COMPOSED_WORK_DEF(n) \
-template <typename Head, BOOST_ASIO_VARIADIC_TPARAMS(n)> \
-struct composed_work<void(Head, BOOST_ASIO_VARIADIC_TARGS(n))> \
-{ \
-  typedef composed_io_executors<void(Head, \
-    BOOST_ASIO_VARIADIC_TARGS(n))> executors_type; \
-\
-  explicit composed_work(const executors_type& ex) BOOST_ASIO_NOEXCEPT \
-    : head_(ex.head_), \
-      tail_(ex.tail_) \
-  { \
-  } \
-\
-  void reset() \
-  { \
-    head_.reset(); \
-    tail_.reset(); \
-  } \
-\
-  typedef Head head_type; \
-  composed_work_guard<Head> head_; \
-  composed_work<void(BOOST_ASIO_VARIADIC_TARGS(n))> tail_; \
-}; \
-/**/
-BOOST_ASIO_VARIADIC_GENERATE(BOOST_ASIO_PRIVATE_COMPOSED_WORK_DEF)
-#undef BOOST_ASIO_PRIVATE_COMPOSED_WORK_DEF
-
-#endif // defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)
-
 #if defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)
 template <typename Impl, typename Work, typename Handler, typename Signature>
 class composed_op;
@@ -344,11 +72,16 @@ public:
   }
 #endif // defined(BOOST_ASIO_HAS_MOVE)
 
-  typedef typename associated_executor<Handler,
-      typename composed_work_guard<
-        typename Work::head_type
-      >::executor_type
-    >::type executor_type;
+  typedef typename composed_work_guard<
+    typename Work::head_type>::executor_type io_executor_type;
+
+  io_executor_type get_io_executor() const BOOST_ASIO_NOEXCEPT
+  {
+    return work_.head_.get_executor();
+  }
+
+  typedef typename associated_executor<Handler, io_executor_type>::type
+    executor_type;
 
   executor_type get_executor() const BOOST_ASIO_NOEXCEPT
   {
@@ -441,6 +174,11 @@ public:
         BOOST_ASIO_MOVE_CAST(OutFilter)(out_filter));
   }
 
+  cancellation_type_t cancelled() const BOOST_ASIO_NOEXCEPT
+  {
+    return base_from_cancellation_state<Handler>::cancelled();
+  }
+
 //private:
   Impl impl_;
   Work work_;
@@ -549,29 +287,6 @@ inline initiate_composed_op<Signature, Executors> make_initiate_composed_op(
       BOOST_ASIO_MOVE_CAST(composed_io_executors<Executors>)(executors));
 }
 
-template <typename IoObject>
-inline typename IoObject::executor_type
-get_composed_io_executor(IoObject& io_object,
-    typename enable_if<
-      !is_executor<IoObject>::value
-    >::type* = 0,
-    typename enable_if<
-      !execution::is_executor<IoObject>::value
-    >::type* = 0)
-{
-  return io_object.get_executor();
-}
-
-template <typename Executor>
-inline const Executor& get_composed_io_executor(const Executor& ex,
-    typename enable_if<
-      is_executor<Executor>::value
-        || execution::is_executor<Executor>::value
-    >::type* = 0)
-{
-  return ex;
-}
-
 } // namespace detail
 
 #if !defined(GENERATING_DOCUMENTATION)
@@ -584,9 +299,19 @@ struct associator<Associator,
     DefaultCandidate>
   : Associator<Handler, DefaultCandidate>
 {
-  static typename Associator<Handler, DefaultCandidate>::type get(
-      const detail::composed_op<Impl, Work, Handler, Signature>& h,
-      const DefaultCandidate& c = DefaultCandidate()) BOOST_ASIO_NOEXCEPT
+  static typename Associator<Handler, DefaultCandidate>::type
+  get(const detail::composed_op<Impl, Work, Handler, Signature>& h)
+    BOOST_ASIO_NOEXCEPT
+  {
+    return Associator<Handler, DefaultCandidate>::get(h.handler_);
+  }
+
+  static BOOST_ASIO_AUTO_RETURN_TYPE_PREFIX2(
+      typename Associator<Handler, DefaultCandidate>::type)
+  get(const detail::composed_op<Impl, Work, Handler, Signature>& h,
+      const DefaultCandidate& c) BOOST_ASIO_NOEXCEPT
+    BOOST_ASIO_AUTO_RETURN_TYPE_SUFFIX((
+      Associator<Handler, DefaultCandidate>::get(h.handler_, c)))
   {
     return Associator<Handler, DefaultCandidate>::get(h.handler_, c);
   }
@@ -609,7 +334,7 @@ struct associator<Associator,
  * handler. The remaining arguments are any arguments that originate from the
  * completion handlers of any asynchronous operations performed by the
  * implementation.
-
+ *
  * @param token The completion token.
  *
  * @param io_objects_or_executors Zero or more I/O objects or I/O executors for