passenger 6.0.3 → 6.0.8

data/src/cxx_supportlib/vendor-modified/boost/asio/detail/reactive_wait_op.hpp

@@ -2,7 +2,7 @@
 // detail/reactive_wait_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -16,9 +16,11 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include <boost/asio/detail/config.hpp>
+#include <boost/asio/detail/bind_handler.hpp>
 #include <boost/asio/detail/fenced_block.hpp>
 #include <boost/asio/detail/handler_alloc_helpers.hpp>
 #include <boost/asio/detail/handler_invoke_helpers.hpp>
+#include <boost/asio/detail/handler_work.hpp>
 #include <boost/asio/detail/memory.hpp>
 #include <boost/asio/detail/reactor_op.hpp>
 
@@ -28,18 +30,19 @@ namespace boost {
 namespace asio {
 namespace detail {
 
-template <typename Handler>
+template <typename Handler, typename IoExecutor>
 class reactive_wait_op : public reactor_op
 {
 public:
   BOOST_ASIO_DEFINE_HANDLER_PTR(reactive_wait_op);
 
-  reactive_wait_op(Handler& handler)
-    : reactor_op(&reactive_wait_op::do_perform,
+  reactive_wait_op(const boost::system::error_code& success_ec,
+      Handler& handler, const IoExecutor& io_ex)
+    : reactor_op(success_ec, &reactive_wait_op::do_perform,
         &reactive_wait_op::do_complete),
-      handler_(BOOST_ASIO_MOVE_CAST(Handler)(handler))
+      handler_(BOOST_ASIO_MOVE_CAST(Handler)(handler)),
+      work_(handler_, io_ex)
   {
-    handler_work<Handler>::start(handler_);
   }
 
   static status do_perform(reactor_op*)
@@ -54,10 +57,14 @@ public:
     // Take ownership of the handler object.
     reactive_wait_op* o(static_cast<reactive_wait_op*>(base));
     ptr p = { boost::asio::detail::addressof(o->handler_), o, o };
-    handler_work<Handler> w(o->handler_);
 
     BOOST_ASIO_HANDLER_COMPLETION((*o));
 
+    // Take ownership of the operation's outstanding work.
+    handler_work<Handler, IoExecutor> w(
+        BOOST_ASIO_MOVE_CAST2(handler_work<Handler, IoExecutor>)(
+          o->work_));
+
     // Make a copy of the handler so that the memory can be deallocated before
     // the upcall is made. Even if we're not about to make an upcall, a
     // sub-object of the handler may be the true owner of the memory associated
@@ -81,6 +88,7 @@ public:
 
 private:
   Handler handler_;
+  handler_work<Handler, IoExecutor> work_;
 };
 
 } // namespace detail

data/src/cxx_supportlib/vendor-modified/boost/asio/detail/reactor.hpp

@@ -2,7 +2,7 @@
 // detail/reactor.hpp
 // ~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

data/src/cxx_supportlib/vendor-modified/boost/asio/detail/reactor_fwd.hpp

@@ -2,7 +2,7 @@
 // detail/reactor_fwd.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

data/src/cxx_supportlib/vendor-modified/boost/asio/detail/reactor_op.hpp

@@ -2,7 +2,7 @@
 // detail/reactor_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -47,8 +47,10 @@ public:
 protected:
   typedef status (*perform_func_type)(reactor_op*);
 
-  reactor_op(perform_func_type perform_func, func_type complete_func)
+  reactor_op(const boost::system::error_code& success_ec,
+      perform_func_type perform_func, func_type complete_func)
     : operation(complete_func),
+      ec_(success_ec),
       bytes_transferred_(0),
       perform_func_(perform_func)
   {

data/src/cxx_supportlib/vendor-modified/boost/asio/detail/reactor_op_queue.hpp

@@ -2,7 +2,7 @@
 // detail/reactor_op_queue.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

data/src/cxx_supportlib/vendor-modified/boost/asio/detail/recycling_allocator.hpp

@@ -2,7 +2,7 @@
 // detail/recycling_allocator.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -26,7 +26,7 @@ namespace boost {
 namespace asio {
 namespace detail {
 
-template <typename T>
+template <typename T, typename Purpose = thread_info_base::default_tag>
 class recycling_allocator
 {
 public:
@@ -35,7 +35,7 @@ public:
   template <typename U>
   struct rebind
   {
-    typedef recycling_allocator<U> other;
+    typedef recycling_allocator<U, Purpose> other;
   };
 
   recycling_allocator()
@@ -43,26 +43,28 @@ public:
   }
 
   template <typename U>
-  recycling_allocator(const recycling_allocator<U>&)
+  recycling_allocator(const recycling_allocator<U, Purpose>&)
   {
   }
 
   T* allocate(std::size_t n)
   {
     typedef thread_context::thread_call_stack call_stack;
-    void* p = thread_info_base::allocate(call_stack::top(), sizeof(T) * n);
+    void* p = thread_info_base::allocate(Purpose(),
+        call_stack::top(), sizeof(T) * n);
     return static_cast<T*>(p);
   }
 
   void deallocate(T* p, std::size_t n)
   {
     typedef thread_context::thread_call_stack call_stack;
-    thread_info_base::deallocate(call_stack::top(), p, sizeof(T) * n);
+    thread_info_base::deallocate(Purpose(),
+        call_stack::top(), p, sizeof(T) * n);
   }
 };
 
-template <>
-class recycling_allocator<void>
+template <typename Purpose>
+class recycling_allocator<void, Purpose>
 {
 public:
   typedef void value_type;
@@ -70,7 +72,7 @@ public:
   template <typename U>
   struct rebind
   {
-    typedef recycling_allocator<U> other;
+    typedef recycling_allocator<U, Purpose> other;
   };
 
   recycling_allocator()
@@ -78,22 +80,22 @@ public:
   }
 
   template <typename U>
-  recycling_allocator(const recycling_allocator<U>&)
+  recycling_allocator(const recycling_allocator<U, Purpose>&)
   {
   }
 };
 
-template <typename Allocator>
+template <typename Allocator, typename Purpose>
 struct get_recycling_allocator
 {
   typedef Allocator type;
   static type get(const Allocator& a) { return a; }
 };
 
-template <typename T>
-struct get_recycling_allocator<std::allocator<T> >
+template <typename T, typename Purpose>
+struct get_recycling_allocator<std::allocator<T>, Purpose>
 {
-  typedef recycling_allocator<T> type;
+  typedef recycling_allocator<T, Purpose> type;
   static type get(const std::allocator<T>&) { return type(); }
 };
 

data/src/cxx_supportlib/vendor-modified/boost/asio/detail/regex_fwd.hpp

@@ -2,7 +2,7 @@
 // detail/regex_fwd.hpp
 // ~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

data/src/cxx_supportlib/vendor-modified/boost/asio/detail/resolve_endpoint_op.hpp

@@ -2,7 +2,7 @@
 // detail/resolve_endpoint_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -16,16 +16,22 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include <boost/asio/detail/config.hpp>
-#include <boost/asio/error.hpp>
-#include <boost/asio/io_context.hpp>
-#include <boost/asio/ip/basic_resolver_results.hpp>
 #include <boost/asio/detail/bind_handler.hpp>
 #include <boost/asio/detail/fenced_block.hpp>
 #include <boost/asio/detail/handler_alloc_helpers.hpp>
 #include <boost/asio/detail/handler_invoke_helpers.hpp>
+#include <boost/asio/detail/handler_work.hpp>
 #include <boost/asio/detail/memory.hpp>
 #include <boost/asio/detail/resolve_op.hpp>
 #include <boost/asio/detail/socket_ops.hpp>
+#include <boost/asio/error.hpp>
+#include <boost/asio/ip/basic_resolver_results.hpp>
+
+#if defined(BOOST_ASIO_HAS_IOCP)
+# include <boost/asio/detail/win_iocp_io_context.hpp>
+#else // defined(BOOST_ASIO_HAS_IOCP)
+# include <boost/asio/detail/scheduler.hpp>
+#endif // defined(BOOST_ASIO_HAS_IOCP)
 
 #include <boost/asio/detail/push_options.hpp>
 
@@ -33,7 +39,7 @@ namespace boost {
 namespace asio {
 namespace detail {
 
-template <typename Protocol, typename Handler>
+template <typename Protocol, typename Handler, typename IoExecutor>
 class resolve_endpoint_op : public resolve_op
 {
 public:
@@ -42,15 +48,22 @@ public:
   typedef typename Protocol::endpoint endpoint_type;
   typedef boost::asio::ip::basic_resolver_results<Protocol> results_type;
 
+#if defined(BOOST_ASIO_HAS_IOCP)
+  typedef class win_iocp_io_context scheduler_impl;
+#else
+  typedef class scheduler scheduler_impl;
+#endif
+
   resolve_endpoint_op(socket_ops::weak_cancel_token_type cancel_token,
-      const endpoint_type& endpoint, io_context_impl& ioc, Handler& handler)
+      const endpoint_type& endpoint, scheduler_impl& sched,
+      Handler& handler, const IoExecutor& io_ex)
     : resolve_op(&resolve_endpoint_op::do_complete),
       cancel_token_(cancel_token),
       endpoint_(endpoint),
-      io_context_impl_(ioc),
-      handler_(BOOST_ASIO_MOVE_CAST(Handler)(handler))
+      scheduler_(sched),
+      handler_(BOOST_ASIO_MOVE_CAST(Handler)(handler)),
+      work_(handler_, io_ex)
   {
-    handler_work<Handler>::start(handler_);
   }
 
   static void do_complete(void* owner, operation* base,
@@ -60,9 +73,8 @@ public:
     // Take ownership of the operation object.
     resolve_endpoint_op* o(static_cast<resolve_endpoint_op*>(base));
     ptr p = { boost::asio::detail::addressof(o->handler_), o, o };
-    handler_work<Handler> w(o->handler_);
 
-    if (owner && owner != &o->io_context_impl_)
+    if (owner && owner != &o->scheduler_)
     {
       // The operation is being run on the worker io_context. Time to perform
       // the resolver operation.
@@ -76,7 +88,7 @@ public:
       o->results_ = results_type::create(o->endpoint_, host_name, service_name);
 
       // Pass operation back to main io_context for completion.
-      o->io_context_impl_.post_deferred_completion(o);
+      o->scheduler_.post_deferred_completion(o);
       p.v = p.p = 0;
     }
     else
@@ -86,6 +98,11 @@ public:
 
       BOOST_ASIO_HANDLER_COMPLETION((*o));
 
+      // Take ownership of the operation's outstanding work.
+      handler_work<Handler, IoExecutor> w(
+          BOOST_ASIO_MOVE_CAST2(handler_work<Handler, IoExecutor>)(
+            o->work_));
+
       // Make a copy of the handler so that the memory can be deallocated
       // before the upcall is made. Even if we're not about to make an upcall,
       // a sub-object of the handler may be the true owner of the memory
@@ -110,8 +127,9 @@ public:
 private:
   socket_ops::weak_cancel_token_type cancel_token_;
   endpoint_type endpoint_;
-  io_context_impl& io_context_impl_;
+  scheduler_impl& scheduler_;
   Handler handler_;
+  handler_work<Handler, IoExecutor> work_;
   results_type results_;
 };
 

data/src/cxx_supportlib/vendor-modified/boost/asio/detail/resolve_op.hpp

@@ -2,7 +2,7 @@
 // detail/resolve_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

data/src/cxx_supportlib/vendor-modified/boost/asio/detail/resolve_query_op.hpp

@@ -2,7 +2,7 @@
 // detail/resolve_query_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -16,17 +16,23 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include <boost/asio/detail/config.hpp>
-#include <boost/asio/error.hpp>
-#include <boost/asio/io_context.hpp>
-#include <boost/asio/ip/basic_resolver_query.hpp>
-#include <boost/asio/ip/basic_resolver_results.hpp>
 #include <boost/asio/detail/bind_handler.hpp>
 #include <boost/asio/detail/fenced_block.hpp>
 #include <boost/asio/detail/handler_alloc_helpers.hpp>
 #include <boost/asio/detail/handler_invoke_helpers.hpp>
+#include <boost/asio/detail/handler_work.hpp>
 #include <boost/asio/detail/memory.hpp>
 #include <boost/asio/detail/resolve_op.hpp>
 #include <boost/asio/detail/socket_ops.hpp>
+#include <boost/asio/error.hpp>
+#include <boost/asio/ip/basic_resolver_query.hpp>
+#include <boost/asio/ip/basic_resolver_results.hpp>
+
+#if defined(BOOST_ASIO_HAS_IOCP)
+# include <boost/asio/detail/win_iocp_io_context.hpp>
+#else // defined(BOOST_ASIO_HAS_IOCP)
+# include <boost/asio/detail/scheduler.hpp>
+#endif // defined(BOOST_ASIO_HAS_IOCP)
 
 #include <boost/asio/detail/push_options.hpp>
 
@@ -34,7 +40,7 @@ namespace boost {
 namespace asio {
 namespace detail {
 
-template <typename Protocol, typename Handler>
+template <typename Protocol, typename Handler, typename IoExecutor>
 class resolve_query_op : public resolve_op
 {
 public:
@@ -43,16 +49,23 @@ public:
   typedef boost::asio::ip::basic_resolver_query<Protocol> query_type;
   typedef boost::asio::ip::basic_resolver_results<Protocol> results_type;
 
+#if defined(BOOST_ASIO_HAS_IOCP)
+  typedef class win_iocp_io_context scheduler_impl;
+#else
+  typedef class scheduler scheduler_impl;
+#endif
+
   resolve_query_op(socket_ops::weak_cancel_token_type cancel_token,
-      const query_type& query, io_context_impl& ioc, Handler& handler)
+      const query_type& query, scheduler_impl& sched,
+      Handler& handler, const IoExecutor& io_ex)
     : resolve_op(&resolve_query_op::do_complete),
       cancel_token_(cancel_token),
       query_(query),
-      io_context_impl_(ioc),
+      scheduler_(sched),
       handler_(BOOST_ASIO_MOVE_CAST(Handler)(handler)),
+      work_(handler_, io_ex),
       addrinfo_(0)
   {
-    handler_work<Handler>::start(handler_);
   }
 
   ~resolve_query_op()
@@ -69,7 +82,7 @@ public:
     resolve_query_op* o(static_cast<resolve_query_op*>(base));
     ptr p = { boost::asio::detail::addressof(o->handler_), o, o };
 
-    if (owner && owner != &o->io_context_impl_)
+    if (owner && owner != &o->scheduler_)
     {
       // The operation is being run on the worker io_context. Time to perform
       // the resolver operation.
@@ -80,7 +93,7 @@ public:
           o->query_.hints(), &o->addrinfo_, o->ec_);
 
       // Pass operation back to main io_context for completion.
-      o->io_context_impl_.post_deferred_completion(o);
+      o->scheduler_.post_deferred_completion(o);
       p.v = p.p = 0;
     }
     else
@@ -88,11 +101,13 @@ public:
       // The operation has been returned to the main io_context. The completion
       // handler is ready to be delivered.
 
-      // Take ownership of the operation's outstanding work.
-      handler_work<Handler> w(o->handler_);
-
       BOOST_ASIO_HANDLER_COMPLETION((*o));
 
+      // Take ownership of the operation's outstanding work.
+      handler_work<Handler, IoExecutor> w(
+          BOOST_ASIO_MOVE_CAST2(handler_work<Handler, IoExecutor>)(
+            o->work_));
+
       // Make a copy of the handler so that the memory can be deallocated
       // before the upcall is made. Even if we're not about to make an upcall,
       // a sub-object of the handler may be the true owner of the memory
@@ -122,8 +137,9 @@ public:
 private:
   socket_ops::weak_cancel_token_type cancel_token_;
   query_type query_;
-  io_context_impl& io_context_impl_;
+  scheduler_impl& scheduler_;
   Handler handler_;
+  handler_work<Handler, IoExecutor> work_;
   boost::asio::detail::addrinfo_type* addrinfo_;
 };