passenger 5.3.3 → 5.3.4

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

@@ -2,7 +2,7 @@
 // socket_base.hpp
 // ~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2018 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)
@@ -76,6 +76,22 @@ public:
       message_end_of_record = BOOST_ASIO_OS_DEF(MSG_EOR));
 #endif
 
+  /// Wait types.
+  /**
+   * For use with basic_socket::wait() and basic_socket::async_wait().
+   */
+  enum wait_type
+  {
+    /// Wait for a socket to become ready to read.
+    wait_read,
+
+    /// Wait for a socket to become ready to write.
+    wait_write,
+
+    /// Wait for a socket to have error conditions pending.
+    wait_error
+  };
+
   /// Socket option to permit sending of broadcast messages.
   /**
    * Implements the SOL_SOCKET/SO_BROADCAST socket option.
@@ -83,7 +99,7 @@ public:
    * @par Examples
    * Setting the option:
    * @code
-   * boost::asio::ip::udp::socket socket(io_service); 
+   * boost::asio::ip::udp::socket socket(io_context); 
    * ...
    * boost::asio::socket_base::broadcast option(true);
    * socket.set_option(option);
@@ -92,7 +108,7 @@ public:
    * @par
    * Getting the current option value:
    * @code
-   * boost::asio::ip::udp::socket socket(io_service); 
+   * boost::asio::ip::udp::socket socket(io_context); 
    * ...
    * boost::asio::socket_base::broadcast option;
    * socket.get_option(option);
@@ -117,7 +133,7 @@ public:
    * @par Examples
    * Setting the option:
    * @code
-   * boost::asio::ip::tcp::socket socket(io_service); 
+   * boost::asio::ip::tcp::socket socket(io_context); 
    * ...
    * boost::asio::socket_base::debug option(true);
    * socket.set_option(option);
@@ -126,7 +142,7 @@ public:
    * @par
    * Getting the current option value:
    * @code
-   * boost::asio::ip::tcp::socket socket(io_service); 
+   * boost::asio::ip::tcp::socket socket(io_context); 
    * ...
    * boost::asio::socket_base::debug option;
    * socket.get_option(option);
@@ -150,7 +166,7 @@ public:
    * @par Examples
    * Setting the option:
    * @code
-   * boost::asio::ip::udp::socket socket(io_service); 
+   * boost::asio::ip::udp::socket socket(io_context); 
    * ...
    * boost::asio::socket_base::do_not_route option(true);
    * socket.set_option(option);
@@ -159,7 +175,7 @@ public:
    * @par
    * Getting the current option value:
    * @code
-   * boost::asio::ip::udp::socket socket(io_service); 
+   * boost::asio::ip::udp::socket socket(io_context); 
    * ...
    * boost::asio::socket_base::do_not_route option;
    * socket.get_option(option);
@@ -184,7 +200,7 @@ public:
    * @par Examples
    * Setting the option:
    * @code
-   * boost::asio::ip::tcp::socket socket(io_service); 
+   * boost::asio::ip::tcp::socket socket(io_context); 
    * ...
    * boost::asio::socket_base::keep_alive option(true);
    * socket.set_option(option);
@@ -193,7 +209,7 @@ public:
    * @par
    * Getting the current option value:
    * @code
-   * boost::asio::ip::tcp::socket socket(io_service); 
+   * boost::asio::ip::tcp::socket socket(io_context); 
    * ...
    * boost::asio::socket_base::keep_alive option;
    * socket.get_option(option);
@@ -217,7 +233,7 @@ public:
    * @par Examples
    * Setting the option:
    * @code
-   * boost::asio::ip::tcp::socket socket(io_service); 
+   * boost::asio::ip::tcp::socket socket(io_context); 
    * ...
    * boost::asio::socket_base::send_buffer_size option(8192);
    * socket.set_option(option);
@@ -226,7 +242,7 @@ public:
    * @par
    * Getting the current option value:
    * @code
-   * boost::asio::ip::tcp::socket socket(io_service); 
+   * boost::asio::ip::tcp::socket socket(io_context); 
    * ...
    * boost::asio::socket_base::send_buffer_size option;
    * socket.get_option(option);
@@ -251,7 +267,7 @@ public:
    * @par Examples
    * Setting the option:
    * @code
-   * boost::asio::ip::tcp::socket socket(io_service); 
+   * boost::asio::ip::tcp::socket socket(io_context); 
    * ...
    * boost::asio::socket_base::send_low_watermark option(1024);
    * socket.set_option(option);
@@ -260,7 +276,7 @@ public:
    * @par
    * Getting the current option value:
    * @code
-   * boost::asio::ip::tcp::socket socket(io_service); 
+   * boost::asio::ip::tcp::socket socket(io_context); 
    * ...
    * boost::asio::socket_base::send_low_watermark option;
    * socket.get_option(option);
@@ -285,7 +301,7 @@ public:
    * @par Examples
    * Setting the option:
    * @code
-   * boost::asio::ip::tcp::socket socket(io_service); 
+   * boost::asio::ip::tcp::socket socket(io_context); 
    * ...
    * boost::asio::socket_base::receive_buffer_size option(8192);
    * socket.set_option(option);
@@ -294,7 +310,7 @@ public:
    * @par
    * Getting the current option value:
    * @code
-   * boost::asio::ip::tcp::socket socket(io_service); 
+   * boost::asio::ip::tcp::socket socket(io_context); 
    * ...
    * boost::asio::socket_base::receive_buffer_size option;
    * socket.get_option(option);
@@ -319,7 +335,7 @@ public:
    * @par Examples
    * Setting the option:
    * @code
-   * boost::asio::ip::tcp::socket socket(io_service); 
+   * boost::asio::ip::tcp::socket socket(io_context); 
    * ...
    * boost::asio::socket_base::receive_low_watermark option(1024);
    * socket.set_option(option);
@@ -328,7 +344,7 @@ public:
    * @par
    * Getting the current option value:
    * @code
-   * boost::asio::ip::tcp::socket socket(io_service); 
+   * boost::asio::ip::tcp::socket socket(io_context); 
    * ...
    * boost::asio::socket_base::receive_low_watermark option;
    * socket.get_option(option);
@@ -354,7 +370,7 @@ public:
    * @par Examples
    * Setting the option:
    * @code
-   * boost::asio::ip::tcp::acceptor acceptor(io_service); 
+   * boost::asio::ip::tcp::acceptor acceptor(io_context); 
    * ...
    * boost::asio::socket_base::reuse_address option(true);
    * acceptor.set_option(option);
@@ -363,7 +379,7 @@ public:
    * @par
    * Getting the current option value:
    * @code
-   * boost::asio::ip::tcp::acceptor acceptor(io_service); 
+   * boost::asio::ip::tcp::acceptor acceptor(io_context); 
    * ...
    * boost::asio::socket_base::reuse_address option;
    * acceptor.get_option(option);
@@ -389,7 +405,7 @@ public:
    * @par Examples
    * Setting the option:
    * @code
-   * boost::asio::ip::tcp::socket socket(io_service); 
+   * boost::asio::ip::tcp::socket socket(io_context); 
    * ...
    * boost::asio::socket_base::linger option(true, 30);
    * socket.set_option(option);
@@ -398,7 +414,7 @@ public:
    * @par
    * Getting the current option value:
    * @code
-   * boost::asio::ip::tcp::socket socket(io_service); 
+   * boost::asio::ip::tcp::socket socket(io_context); 
    * ...
    * boost::asio::socket_base::linger option;
    * socket.get_option(option);
@@ -417,6 +433,40 @@ public:
       linger;
 #endif
 
+  /// Socket option for putting received out-of-band data inline.
+  /**
+   * Implements the SOL_SOCKET/SO_OOBINLINE socket option.
+   *
+   * @par Examples
+   * Setting the option:
+   * @code
+   * boost::asio::ip::tcp::socket socket(io_context);
+   * ...
+   * boost::asio::socket_base::out_of_band_inline option(true);
+   * socket.set_option(option);
+   * @endcode
+   *
+   * @par
+   * Getting the current option value:
+   * @code
+   * boost::asio::ip::tcp::socket socket(io_context);
+   * ...
+   * boost::asio::socket_base::out_of_band_inline option;
+   * socket.get_option(option);
+   * bool value = option.value();
+   * @endcode
+   *
+   * @par Concepts:
+   * Socket_Option, Boolean_Socket_Option.
+   */
+#if defined(GENERATING_DOCUMENTATION)
+  typedef implementation_defined out_of_band_inline;
+#else
+  typedef boost::asio::detail::socket_option::boolean<
+    BOOST_ASIO_OS_DEF(SOL_SOCKET), BOOST_ASIO_OS_DEF(SO_OOBINLINE)>
+      out_of_band_inline;
+#endif
+
   /// Socket option to report aborted connections on accept.
   /**
    * Implements a custom socket option that determines whether or not an accept
@@ -426,7 +476,7 @@ public:
    * @par Examples
    * Setting the option:
    * @code
-   * boost::asio::ip::tcp::acceptor acceptor(io_service); 
+   * boost::asio::ip::tcp::acceptor acceptor(io_context); 
    * ...
    * boost::asio::socket_base::enable_connection_aborted option(true);
    * acceptor.set_option(option);
@@ -435,7 +485,7 @@ public:
    * @par
    * Getting the current option value:
    * @code
-   * boost::asio::ip::tcp::acceptor acceptor(io_service); 
+   * boost::asio::ip::tcp::acceptor acceptor(io_context); 
    * ...
    * boost::asio::socket_base::enable_connection_aborted option;
    * acceptor.get_option(option);
@@ -454,28 +504,6 @@ public:
     enable_connection_aborted;
 #endif
 
-  /// (Deprecated: Use non_blocking().) IO control command to
-  /// set the blocking mode of the socket.
-  /**
-   * Implements the FIONBIO IO control command.
-   *
-   * @par Example
-   * @code
-   * boost::asio::ip::tcp::socket socket(io_service); 
-   * ...
-   * boost::asio::socket_base::non_blocking_io command(true);
-   * socket.io_control(command);
-   * @endcode
-   *
-   * @par Concepts:
-   * IO_Control_Command, Boolean_IO_Control_Command.
-   */
-#if defined(GENERATING_DOCUMENTATION)
-  typedef implementation_defined non_blocking_io;
-#else
-  typedef boost::asio::detail::io_control::non_blocking_io non_blocking_io;
-#endif
-
   /// IO control command to get the amount of data that can be read without
   /// blocking.
   /**
@@ -483,7 +511,7 @@ public:
    *
    * @par Example
    * @code
-   * boost::asio::ip::tcp::socket socket(io_service); 
+   * boost::asio::ip::tcp::socket socket(io_context); 
    * ...
    * boost::asio::socket_base::bytes_readable command(true);
    * socket.io_control(command);
@@ -500,12 +528,23 @@ public:
 #endif
 
   /// The maximum length of the queue of pending incoming connections.
+#if defined(GENERATING_DOCUMENTATION)
+  static const int max_listen_connections = implementation_defined;
+#else
+  BOOST_ASIO_STATIC_CONSTANT(int, max_listen_connections
+      = BOOST_ASIO_OS_DEF(SOMAXCONN));
+#endif
+
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+  /// (Deprecated: Use max_listen_connections.) The maximum length of the queue
+  /// of pending incoming connections.
 #if defined(GENERATING_DOCUMENTATION)
   static const int max_connections = implementation_defined;
 #else
   BOOST_ASIO_STATIC_CONSTANT(int, max_connections
       = BOOST_ASIO_OS_DEF(SOMAXCONN));
 #endif
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
 
 protected:
   /// Protected destructor to prevent deletion through this type.

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

@@ -2,7 +2,7 @@
 // spawn.hpp
 // ~~~~~~~~~
 //
-// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2018 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)
@@ -17,9 +17,13 @@
 
 #include <boost/asio/detail/config.hpp>
 #include <boost/coroutine/all.hpp>
-#include <boost/asio/detail/weak_ptr.hpp>
+#include <boost/asio/bind_executor.hpp>
+#include <boost/asio/detail/memory.hpp>
+#include <boost/asio/detail/type_traits.hpp>
 #include <boost/asio/detail/wrapped_handler.hpp>
-#include <boost/asio/io_service.hpp>
+#include <boost/asio/executor.hpp>
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/is_executor.hpp>
 #include <boost/asio/strand.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
@@ -95,6 +99,19 @@ public:
   {
   }
 
+  /// Construct a yield context from another yield context type.
+  /**
+   * Requires that OtherHandler be convertible to Handler.
+   */
+  template <typename OtherHandler>
+  basic_yield_context(const basic_yield_context<OtherHandler>& other)
+    : coro_(other.coro_),
+      ca_(other.ca_),
+      handler_(other.handler_),
+      ec_(other.ec_)
+  {
+  }
+
   /// Return a yield context that sets the specified error_code.
   /**
    * By default, when a yield context is used with an asynchronous operation, a
@@ -126,7 +143,7 @@ private:
 #endif // defined(GENERATING_DOCUMENTATION)
   detail::weak_ptr<callee_type> coro_;
   caller_type& ca_;
-  Handler& handler_;
+  Handler handler_;
   boost::system::error_code* ec_;
 };
 
@@ -135,9 +152,7 @@ private:
 typedef basic_yield_context<unspecified> yield_context;
 #else // defined(GENERATING_DOCUMENTATION)
 typedef basic_yield_context<
-  detail::wrapped_handler<
-    io_service::strand, void(*)(),
-    detail::is_continuation_if_running> > yield_context;
+  executor_binder<void(*)(), executor> > yield_context;
 #endif // defined(GENERATING_DOCUMENTATION)
 
 /**
@@ -176,6 +191,21 @@ typedef basic_yield_context<
  */
 /*@{*/
 
+/// Start a new stackful coroutine, calling the specified handler when it
+/// completes.
+/**
+ * This function is used to launch a new coroutine.
+ *
+ * @param function The coroutine function. The function must have the signature:
+ * @code void function(basic_yield_context<Handler> yield); @endcode
+ *
+ * @param attributes Boost.Coroutine attributes used to customise the coroutine.
+ */
+template <typename Function>
+void spawn(BOOST_ASIO_MOVE_ARG(Function) function,
+    const boost::coroutines::attributes& attributes
+      = boost::coroutines::attributes());
+
 /// Start a new stackful coroutine, calling the specified handler when it
 /// completes.
 /**
@@ -195,7 +225,9 @@ template <typename Handler, typename Function>
 void spawn(BOOST_ASIO_MOVE_ARG(Handler) handler,
     BOOST_ASIO_MOVE_ARG(Function) function,
     const boost::coroutines::attributes& attributes
-      = boost::coroutines::attributes());
+      = boost::coroutines::attributes(),
+    typename enable_if<!is_executor<typename decay<Handler>::type>::value &&
+      !is_convertible<Handler&, execution_context&>::value>::type* = 0);
 
 /// Start a new stackful coroutine, inheriting the execution context of another.
 /**
@@ -218,31 +250,49 @@ void spawn(basic_yield_context<Handler> ctx,
     const boost::coroutines::attributes& attributes
       = boost::coroutines::attributes());
 
-/// Start a new stackful coroutine that executes in the context of a strand.
+/// Start a new stackful coroutine that executes on a given executor.
 /**
  * This function is used to launch a new coroutine.
  *
- * @param strand Identifies a strand. By starting multiple coroutines on the
- * same strand, the implementation ensures that none of those coroutines can
- * execute simultaneously.
+ * @param ex Identifies the executor that will run the coroutine. The new
+ * coroutine is implicitly given its own strand within this executor.
  *
  * @param function The coroutine function. The function must have the signature:
  * @code void function(yield_context yield); @endcode
  *
  * @param attributes Boost.Coroutine attributes used to customise the coroutine.
  */
-template <typename Function>
-void spawn(boost::asio::io_service::strand strand,
+template <typename Function, typename Executor>
+void spawn(const Executor& ex,
+    BOOST_ASIO_MOVE_ARG(Function) function,
+    const boost::coroutines::attributes& attributes
+      = boost::coroutines::attributes(),
+    typename enable_if<is_executor<Executor>::value>::type* = 0);
+
+/// Start a new stackful coroutine that executes on a given strand.
+/**
+ * This function is used to launch a new coroutine.
+ *
+ * @param ex Identifies the strand that will run the coroutine.
+ *
+ * @param function The coroutine function. The function must have the signature:
+ * @code void function(yield_context yield); @endcode
+ *
+ * @param attributes Boost.Coroutine attributes used to customise the coroutine.
+ */
+template <typename Function, typename Executor>
+void spawn(const strand<Executor>& ex,
     BOOST_ASIO_MOVE_ARG(Function) function,
     const boost::coroutines::attributes& attributes
       = boost::coroutines::attributes());
 
-/// Start a new stackful coroutine that executes on a given io_service.
+/// Start a new stackful coroutine that executes in the context of a strand.
 /**
  * This function is used to launch a new coroutine.
  *
- * @param io_service Identifies the io_service that will run the coroutine. The
- * new coroutine is implicitly given its own strand within this io_service.
+ * @param s Identifies a strand. By starting multiple coroutines on the same
+ * strand, the implementation ensures that none of those coroutines can execute
+ * simultaneously.
  *
  * @param function The coroutine function. The function must have the signature:
  * @code void function(yield_context yield); @endcode
@@ -250,11 +300,32 @@ void spawn(boost::asio::io_service::strand strand,
  * @param attributes Boost.Coroutine attributes used to customise the coroutine.
  */
 template <typename Function>
-void spawn(boost::asio::io_service& io_service,
+void spawn(const boost::asio::io_context::strand& s,
     BOOST_ASIO_MOVE_ARG(Function) function,
     const boost::coroutines::attributes& attributes
       = boost::coroutines::attributes());
 
+/// Start a new stackful coroutine that executes on a given execution context.
+/**
+ * This function is used to launch a new coroutine.
+ *
+ * @param ctx Identifies the execution context that will run the coroutine. The
+ * new coroutine is implicitly given its own strand within this execution
+ * context.
+ *
+ * @param function The coroutine function. The function must have the signature:
+ * @code void function(yield_context yield); @endcode
+ *
+ * @param attributes Boost.Coroutine attributes used to customise the coroutine.
+ */
+template <typename Function, typename ExecutionContext>
+void spawn(ExecutionContext& ctx,
+    BOOST_ASIO_MOVE_ARG(Function) function,
+    const boost::coroutines::attributes& attributes
+      = boost::coroutines::attributes(),
+    typename enable_if<is_convertible<
+      ExecutionContext&, execution_context&>::value>::type* = 0);
+
 /*@}*/
 
 } // namespace asio