passenger 6.0.16 → 6.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ed286b35fe2afc9916972e242806d8ef6f38996
-  data.tar.gz: d0286a8f800b66ebb734da79ef381e8886b8c542
+  metadata.gz: 4745b4abf125d1350bf6ea520477b1d8a1faae26
+  data.tar.gz: e3fe30496ed0567cd283f3ee96751c6baaa35f00
 SHA512:
-  metadata.gz: 7c654ed76d439bdc87b06986fdd651d198c3f5334f589705a0d616545fff738b2f096962a437cdf65379bf6c9c809c833c8f9f19d604ef8fe0a64c4d5d345551
-  data.tar.gz: c6a215512170735670e7a33ac43010cc02e72560aec30899154e2828cd7860ae3f83c4fc028d8c9556cde045deaf02e79a04b91a3458949582360b28ef2293bb
+  metadata.gz: f561f10cee769f11824a2c8bbd74d35b8305e22906682af51ec68819cc53fbeb27ce6a57fbe7022eff27adb4cd0dded348a2a7d7b3051ce8d11054c66a8e3f16
+  data.tar.gz: 97198581be7ab01b816beeab4b6e2cbd90182af418410cd298a3290c1ec2c97a1473c1ae63376e362337dd06e33e93e8ee5ba247d9935159dd4cafcaf4fb1211

data/CHANGELOG

@@ -1,5 +1,26 @@
-Release 6.0.16 (Not yet released)
+Release 6.0.17 (Not yet released)
+-------------
+ * [Enterprise] The `debug` gem is now supported for debugging on Ruby 3.1.
+ * Removed use of deprecated 'File.exists?' method for Ruby 3.2.0.
+ * Upgrades Boost to 1.81.
+ * Upgrades preferred Nginx to 1.22.1 from 1.20.2.
+ * Changes minimum supported macOS version to 10.14 Mojave.
+ * Adds support for arm (aarch64) rpm packages.
+ * Adds support for a `PASSENGER_MAX_LOG_LINE_LENGTH_BYTES` environment variable. The default length remains at 8KB. Closes GH-2413.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+   - ccache: 4.6.3 → 4.7.4
+   - curl: 7.86.0 → 7.87.0
+   - git: 2.38.1 → 2.39.0
+   - gnupg: 2.3.8 → 2.4.0
+   - libksba: 1.6.2 → 1.6.3
+   - openssl: 1.1.1s → 3.0.7
+   - rubygems: 3.3.26 → 3.4.3
+   - rubies: added 3.2.0
+
+
+Release 6.0.16
 -------------
+ * Adds ARM64 (aarch64) packages for Ubuntu and Debian.
  * Adds Ubuntu 22.10 "Kinetic" packages, removes Ubuntu 16.04 "Xenial" packages.
  * Adds systemd private tmpdir workaround on Ubuntu/Debian. Closes GH-2397.
  * Downgrade jsoncpp to 1.8.1 from 1.9.5 to fix invalid json generation bug. Closes GH-2445.

data/build/integration_tests.rb

@@ -39,7 +39,7 @@ end
 dependencies = integration_test_dependencies(:_apache2)
 desc "Run Apache 2 integration tests"
 task 'test:integration:apache2' => dependencies do
-  command = "bundle exec rspec -c -f s --tty integration_tests/apache2_tests.rb"
+  command = "bundle exec rspec -c -f d --tty integration_tests/apache2_tests.rb"
   if boolean_option('SUDO')
     command = "#{PlatformInfo.ruby_sudo_command} -E #{command}"
   end
@@ -52,7 +52,7 @@ end
 dependencies = integration_test_dependencies(:_nginx)
 desc "Run Nginx integration tests"
 task 'test:integration:nginx' => dependencies do
-  command = "bundle exec rspec -c -f s --tty integration_tests/nginx_tests.rb"
+  command = "bundle exec rspec -c -f d --tty integration_tests/nginx_tests.rb"
   if boolean_option('SUDO')
     command = "#{PlatformInfo.ruby_sudo_command} -E #{command}"
   end
@@ -69,7 +69,7 @@ end
 dependencies = integration_test_dependencies(:_nginx)
 desc "Run Passenger Standalone integration tests"
 task 'test:integration:standalone' => dependencies do
-  command = "bundle exec rspec -c -f s --tty integration_tests/standalone_tests.rb"
+  command = "bundle exec rspec -c -f d --tty integration_tests/standalone_tests.rb"
   if grep = string_option('E')
     command << " -e #{shesc grep}"
   end
@@ -78,7 +78,7 @@ end
 
 desc "Run native packaging tests"
 task 'test:integration:native_packaging' do
-  command = "bundle exec rspec -c -f s --tty integration_tests/native_packaging_spec.rb"
+  command = "bundle exec rspec -c -f d --tty integration_tests/native_packaging_spec.rb"
   if boolean_option('SUDO')
     command = "#{PlatformInfo.ruby_sudo_command} -E #{command}"
   end
@@ -125,7 +125,7 @@ task 'test:restart' => dependencies do
   i = 1
   while true do
     puts "#{color_code_start}Test run #{i} (press Ctrl-C multiple times to abort)#{color_code_end}"
-    command = "bundle exec rspec -c -f s --tty integration_tests/apache2_tests.rb"
+    command = "bundle exec rspec -c -f d --tty integration_tests/apache2_tests.rb"
     if grep = string_option('E')
       command << " -e #{shesc grep}"
     end
@@ -136,7 +136,7 @@ end
 
 desc "Run source packaging tests"
 task 'test:source_packaging' do
-  command = 'bundle exec rspec -f s -c test/integration_tests/source_packaging_test.rb'
+  command = 'bundle exec rspec -f d -c test/integration_tests/source_packaging_test.rb'
   if grep = string_option('E')
     command << " -e #{shesc grep}"
   end

data/build/ruby_tests.rb

@@ -30,6 +30,6 @@ task 'test:ruby' => dependencies do
   if maybe_grep = string_option('E')
     maybe_grep = "-e #{shesc maybe_grep}"
   end
-  command = "rspec -c -f s --tty -P 'dont-autoload-anything' #{maybe_grep} ruby/*_spec.rb ruby/*/*_spec.rb"
+  command = "rspec -c -f d --tty -P 'dont-autoload-anything' #{maybe_grep} ruby/*_spec.rb ruby/*/*_spec.rb"
   sh "cd test && exec bundle exec #{command}"
 end

data/build/test_basics.rb

@@ -72,7 +72,6 @@ task 'test:install_deps' do
   end
 end
 
-
 def bundler_too_old?
   `bundle --version` =~ /version (.+)/
   version = $1.split('.').map { |x| x.to_i }

data/src/agent/Core/Config.h

@@ -165,7 +165,7 @@ using namespace std;
  *   security_update_checker_interval                                unsigned integer   -          default(86400)
  *   security_update_checker_proxy_url                               string             -          -
  *   security_update_checker_url                                     string             -          default("https://securitycheck.phusionpassenger.com/v1/check.json")
- *   server_software                                                 string             -          default("Phusion_Passenger/6.0.16")
+ *   server_software                                                 string             -          default("Phusion_Passenger/6.0.17")
  *   show_version_in_header                                          boolean            -          default(true)
  *   single_app_mode_app_root                                        string             -          default,read_only
  *   single_app_mode_app_start_command                               string             -          read_only

data/src/agent/Core/Controller/Config.h

@@ -116,7 +116,7 @@ parseControllerBenchmarkMode(const StaticString &mode) {
  *   multi_app                                           boolean            -          default(true),read_only
  *   request_freelist_limit                              unsigned integer   -          default(1024)
  *   response_buffer_high_watermark                      unsigned integer   -          default(134217728)
- *   server_software                                     string             -          default("Phusion_Passenger/6.0.16")
+ *   server_software                                     string             -          default("Phusion_Passenger/6.0.17")
  *   show_version_in_header                              boolean            -          default(true)
  *   start_reading_after_accept                          boolean            -          default(true)
  *   stat_throttle_rate                                  unsigned integer   -          default(10)

data/src/agent/Core/SpawningKit/PipeWatcher.h

@@ -63,6 +63,8 @@ private:
 	string logFile;
 	boost::mutex startSyncher;
 	boost::condition_variable startCond;
+	size_t bufSize;
+	char *buf;
 
 	static void threadMain(boost::shared_ptr<PipeWatcher> self) {
 		TRACE_POINT();
@@ -90,11 +92,12 @@ private:
 
 		UPDATE_TRACE_POINT();
 		while (!boost::this_thread::interruption_requested()) {
-			char buf[1024 * 8];
 			ssize_t ret;
+			
+			buf[0] = '\0';
 
 			UPDATE_TRACE_POINT();
-			ret = syscalls::read(fd, buf, sizeof(buf));
+			ret = syscalls::read(fd, buf, bufSize);
 			if (ret == 0) {
 				break;
 			} else if (ret == -1) {
@@ -150,14 +153,26 @@ public:
 		  appGroupName(_appGroupName),
 		  appLogFile(_appLogFile),
 		  pid(_pid),
-		  started(false)
+		  started(false),
+		  bufSize(1024 * 8),
+		  buf(NULL)
 		{ }
 
+	~PipeWatcher() {
+		delete[] buf;
+	}
+
 	void setLogFile(const string &path) {
 		logFile = path;
 	}
 
 	void initialize() {
+		const char *envMaxLogBytes = getenv("PASSENGER_MAX_LOG_LINE_LENGTH_BYTES");
+		if (envMaxLogBytes != NULL && *envMaxLogBytes != '\0') {
+			bufSize = atoi(envMaxLogBytes);
+		}
+		buf = new char[bufSize];
+
 		oxt::thread(boost::bind(threadMain, shared_from_this()),
 			"PipeWatcher: PID " + toString(pid) + " " + name + ", fd " + toString(fd),
 			POOL_HELPER_THREAD_STACK_SIZE);

data/src/agent/Watchdog/Config.h

@@ -154,7 +154,7 @@ using namespace std;
  *   security_update_checker_interval                                         unsigned integer   -          default(86400)
  *   security_update_checker_proxy_url                                        string             -          -
  *   security_update_checker_url                                              string             -          default("https://securitycheck.phusionpassenger.com/v1/check.json")
- *   server_software                                                          string             -          default("Phusion_Passenger/6.0.16")
+ *   server_software                                                          string             -          default("Phusion_Passenger/6.0.17")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only

data/src/cxx_supportlib/Constants.h

@@ -83,7 +83,7 @@
 #define PASSENGER_API_VERSION_MAJOR 0
 #define PASSENGER_API_VERSION_MINOR 3
 #define PASSENGER_DEFAULT_USER "nobody"
-#define PASSENGER_VERSION "6.0.16"
+#define PASSENGER_VERSION "6.0.17"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"

data/src/cxx_supportlib/vendor-modified/boost/align/aligned_alloc.hpp

@@ -38,7 +38,7 @@ Distributed under the Boost Software License, Version 1.0.
 #include <boost/align/detail/aligned_alloc_posix.hpp>
 #elif defined(sun) || defined(__sun)
 #include <boost/align/detail/aligned_alloc_sunos.hpp>
-#elif (_POSIX_C_SOURCE >= 200112L) || (_XOPEN_SOURCE >= 600)
+#elif defined(_POSIX_VERSION)
 #include <boost/align/detail/aligned_alloc_posix.hpp>
 #else
 #include <boost/align/detail/aligned_alloc.hpp>

data/src/cxx_supportlib/vendor-modified/boost/array.hpp

@@ -44,8 +44,8 @@
 #include <iterator>
 #include <stdexcept>
 #include <boost/assert.hpp>
+#include <boost/core/swap.hpp>
 #include <boost/static_assert.hpp>
-#include <boost/swap.hpp>
 
 #include <boost/throw_exception.hpp>
 #include <algorithm>

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

@@ -0,0 +1,344 @@
+//
+// any_completion_executor.hpp
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2022 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)
+//
+
+#ifndef BOOST_ASIO_ANY_COMPLETION_EXECUTOR_HPP
+#define BOOST_ASIO_ANY_COMPLETION_EXECUTOR_HPP
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma once
+#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
+
+#include <boost/asio/detail/config.hpp>
+#if defined(BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT)
+# include <boost/asio/executor.hpp>
+#else // defined(BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT)
+# include <boost/asio/execution.hpp>
+#endif // defined(BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT)
+
+#include <boost/asio/detail/push_options.hpp>
+
+namespace boost {
+namespace asio {
+
+#if defined(BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT)
+
+typedef executor any_completion_executor;
+
+#else // defined(BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT)
+
+/// Polymorphic executor type for use with I/O objects.
+/**
+ * The @c any_completion_executor type is a polymorphic executor that supports
+ * the set of properties required for the execution of completion handlers. It
+ * is defined as the execution::any_executor class template parameterised as
+ * follows:
+ * @code execution::any_executor<
+ *   execution::prefer_only<execution::outstanding_work_t::tracked_t>,
+ *   execution::prefer_only<execution::outstanding_work_t::untracked_t>
+ *   execution::prefer_only<execution::relationship_t::fork_t>,
+ *   execution::prefer_only<execution::relationship_t::continuation_t>
+ * > @endcode
+ */
+class any_completion_executor :
+#if defined(GENERATING_DOCUMENTATION)
+  public execution::any_executor<...>
+#else // defined(GENERATING_DOCUMENTATION)
+  public execution::any_executor<
+      execution::prefer_only<execution::outstanding_work_t::tracked_t>,
+      execution::prefer_only<execution::outstanding_work_t::untracked_t>,
+      execution::prefer_only<execution::relationship_t::fork_t>,
+      execution::prefer_only<execution::relationship_t::continuation_t>
+    >
+#endif // defined(GENERATING_DOCUMENTATION)
+{
+public:
+#if !defined(GENERATING_DOCUMENTATION)
+  typedef execution::any_executor<
+      execution::prefer_only<execution::outstanding_work_t::tracked_t>,
+      execution::prefer_only<execution::outstanding_work_t::untracked_t>,
+      execution::prefer_only<execution::relationship_t::fork_t>,
+      execution::prefer_only<execution::relationship_t::continuation_t>
+    > base_type;
+
+  typedef void supportable_properties_type(
+      execution::prefer_only<execution::outstanding_work_t::tracked_t>,
+      execution::prefer_only<execution::outstanding_work_t::untracked_t>,
+      execution::prefer_only<execution::relationship_t::fork_t>,
+      execution::prefer_only<execution::relationship_t::continuation_t>
+    );
+#endif // !defined(GENERATING_DOCUMENTATION)
+
+  /// Default constructor.
+  BOOST_ASIO_DECL any_completion_executor() BOOST_ASIO_NOEXCEPT;
+
+  /// Construct in an empty state. Equivalent effects to default constructor.
+  BOOST_ASIO_DECL any_completion_executor(nullptr_t) BOOST_ASIO_NOEXCEPT;
+
+  /// Copy constructor.
+  BOOST_ASIO_DECL any_completion_executor(
+      const any_completion_executor& e) BOOST_ASIO_NOEXCEPT;
+
+#if defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
+  /// Move constructor.
+  BOOST_ASIO_DECL any_completion_executor(
+      any_completion_executor&& e) BOOST_ASIO_NOEXCEPT;
+#endif // defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
+
+  /// Construct to point to the same target as another any_executor.
+#if defined(GENERATING_DOCUMENTATION)
+  template <class... OtherSupportableProperties>
+    any_completion_executor(
+        execution::any_executor<OtherSupportableProperties...> e);
+#else // defined(GENERATING_DOCUMENTATION)
+  template <typename OtherAnyExecutor>
+  any_completion_executor(OtherAnyExecutor e,
+      typename constraint<
+        conditional<
+          !is_same<OtherAnyExecutor, any_completion_executor>::value
+            && is_base_of<execution::detail::any_executor_base,
+              OtherAnyExecutor>::value,
+          typename execution::detail::supportable_properties<
+            0, supportable_properties_type>::template
+              is_valid_target<OtherAnyExecutor>,
+          false_type
+        >::type::value
+      >::type = 0)
+    : base_type(BOOST_ASIO_MOVE_CAST(OtherAnyExecutor)(e))
+  {
+  }
+#endif // defined(GENERATING_DOCUMENTATION)
+
+  /// Construct to point to the same target as another any_executor.
+#if defined(GENERATING_DOCUMENTATION)
+  template <class... OtherSupportableProperties>
+    any_completion_executor(std::nothrow_t,
+      execution::any_executor<OtherSupportableProperties...> e);
+#else // defined(GENERATING_DOCUMENTATION)
+  template <typename OtherAnyExecutor>
+  any_completion_executor(std::nothrow_t, OtherAnyExecutor e,
+      typename constraint<
+        conditional<
+          !is_same<OtherAnyExecutor, any_completion_executor>::value
+            && is_base_of<execution::detail::any_executor_base,
+              OtherAnyExecutor>::value,
+          typename execution::detail::supportable_properties<
+            0, supportable_properties_type>::template
+              is_valid_target<OtherAnyExecutor>,
+          false_type
+        >::type::value
+      >::type = 0) BOOST_ASIO_NOEXCEPT
+    : base_type(std::nothrow, BOOST_ASIO_MOVE_CAST(OtherAnyExecutor)(e))
+  {
+  }
+#endif // defined(GENERATING_DOCUMENTATION)
+
+  /// Construct to point to the same target as another any_executor.
+  BOOST_ASIO_DECL any_completion_executor(std::nothrow_t,
+      const any_completion_executor& e) BOOST_ASIO_NOEXCEPT;
+
+#if defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
+  /// Construct to point to the same target as another any_executor.
+  BOOST_ASIO_DECL any_completion_executor(std::nothrow_t,
+      any_completion_executor&& e) BOOST_ASIO_NOEXCEPT;
+#endif // defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
+
+  /// Construct a polymorphic wrapper for the specified executor.
+#if defined(GENERATING_DOCUMENTATION)
+  template <BOOST_ASIO_EXECUTION_EXECUTOR Executor>
+  any_completion_executor(Executor e);
+#else // defined(GENERATING_DOCUMENTATION)
+  template <BOOST_ASIO_EXECUTION_EXECUTOR Executor>
+  any_completion_executor(Executor e,
+      typename constraint<
+        conditional<
+          !is_same<Executor, any_completion_executor>::value
+            && !is_base_of<execution::detail::any_executor_base,
+              Executor>::value,
+          execution::detail::is_valid_target_executor<
+            Executor, supportable_properties_type>,
+          false_type
+        >::type::value
+      >::type = 0)
+    : base_type(BOOST_ASIO_MOVE_CAST(Executor)(e))
+  {
+  }
+#endif // defined(GENERATING_DOCUMENTATION)
+
+  /// Construct a polymorphic wrapper for the specified executor.
+#if defined(GENERATING_DOCUMENTATION)
+  template <BOOST_ASIO_EXECUTION_EXECUTOR Executor>
+  any_completion_executor(std::nothrow_t, Executor e);
+#else // defined(GENERATING_DOCUMENTATION)
+  template <BOOST_ASIO_EXECUTION_EXECUTOR Executor>
+  any_completion_executor(std::nothrow_t, Executor e,
+      typename constraint<
+        conditional<
+          !is_same<Executor, any_completion_executor>::value
+            && !is_base_of<execution::detail::any_executor_base,
+              Executor>::value,
+          execution::detail::is_valid_target_executor<
+            Executor, supportable_properties_type>,
+          false_type
+        >::type::value
+      >::type = 0) BOOST_ASIO_NOEXCEPT
+    : base_type(std::nothrow, BOOST_ASIO_MOVE_CAST(Executor)(e))
+  {
+  }
+#endif // defined(GENERATING_DOCUMENTATION)
+
+  /// Assignment operator.
+  BOOST_ASIO_DECL any_completion_executor& operator=(
+      const any_completion_executor& e) BOOST_ASIO_NOEXCEPT;
+
+#if defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
+  /// Move assignment operator.
+  BOOST_ASIO_DECL any_completion_executor& operator=(
+      any_completion_executor&& e) BOOST_ASIO_NOEXCEPT;
+#endif // defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
+
+  /// Assignment operator that sets the polymorphic wrapper to the empty state.
+  BOOST_ASIO_DECL any_completion_executor& operator=(nullptr_t);
+
+  /// Destructor.
+  BOOST_ASIO_DECL ~any_completion_executor();
+
+  /// Swap targets with another polymorphic wrapper.
+  BOOST_ASIO_DECL void swap(any_completion_executor& other) BOOST_ASIO_NOEXCEPT;
+
+  /// Obtain a polymorphic wrapper with the specified property.
+  /**
+   * Do not call this function directly. It is intended for use with the
+   * boost::asio::require and boost::asio::prefer customisation points.
+   *
+   * For example:
+   * @code any_completion_executor ex = ...;
+   * auto ex2 = boost::asio::require(ex, execution::relationship.fork); @endcode
+   */
+  template <typename Property>
+  any_completion_executor require(const Property& p,
+      typename constraint<
+        traits::require_member<const base_type&, const Property&>::is_valid
+      >::type = 0) const
+  {
+    return static_cast<const base_type&>(*this).require(p);
+  }
+
+  /// Obtain a polymorphic wrapper with the specified property.
+  /**
+   * Do not call this function directly. It is intended for use with the
+   * boost::asio::prefer customisation point.
+   *
+   * For example:
+   * @code any_completion_executor ex = ...;
+   * auto ex2 = boost::asio::prefer(ex, execution::relationship.fork); @endcode
+   */
+  template <typename Property>
+  any_completion_executor prefer(const Property& p,
+      typename constraint<
+        traits::prefer_member<const base_type&, const Property&>::is_valid
+      >::type = 0) const
+  {
+    return static_cast<const base_type&>(*this).prefer(p);
+  }
+};
+
+#if !defined(GENERATING_DOCUMENTATION)
+
+template <>
+BOOST_ASIO_DECL any_completion_executor any_completion_executor::prefer(
+    const execution::outstanding_work_t::tracked_t&, int) const;
+
+template <>
+BOOST_ASIO_DECL any_completion_executor any_completion_executor::prefer(
+    const execution::outstanding_work_t::untracked_t&, int) const;
+
+template <>
+BOOST_ASIO_DECL any_completion_executor any_completion_executor::prefer(
+    const execution::relationship_t::fork_t&, int) const;
+
+template <>
+BOOST_ASIO_DECL any_completion_executor any_completion_executor::prefer(
+    const execution::relationship_t::continuation_t&, int) const;
+
+namespace traits {
+
+#if !defined(BOOST_ASIO_HAS_DEDUCED_EQUALITY_COMPARABLE_TRAIT)
+
+template <>
+struct equality_comparable<any_completion_executor>
+{
+  static const bool is_valid = true;
+  static const bool is_noexcept = true;
+};
+
+#endif // !defined(BOOST_ASIO_HAS_DEDUCED_EQUALITY_COMPARABLE_TRAIT)
+
+#if !defined(BOOST_ASIO_HAS_DEDUCED_EXECUTE_MEMBER_TRAIT)
+
+template <typename F>
+struct execute_member<any_completion_executor, F>
+{
+  static const bool is_valid = true;
+  static const bool is_noexcept = false;
+  typedef void result_type;
+};
+
+#endif // !defined(BOOST_ASIO_HAS_DEDUCED_EXECUTE_MEMBER_TRAIT)
+
+#if !defined(BOOST_ASIO_HAS_DEDUCED_QUERY_MEMBER_TRAIT)
+
+template <typename Prop>
+struct query_member<any_completion_executor, Prop> :
+  query_member<any_completion_executor::base_type, Prop>
+{
+};
+
+#endif // !defined(BOOST_ASIO_HAS_DEDUCED_QUERY_MEMBER_TRAIT)
+
+#if !defined(BOOST_ASIO_HAS_DEDUCED_REQUIRE_MEMBER_TRAIT)
+
+template <typename Prop>
+struct require_member<any_completion_executor, Prop> :
+  require_member<any_completion_executor::base_type, Prop>
+{
+  typedef any_completion_executor result_type;
+};
+
+#endif // !defined(BOOST_ASIO_HAS_DEDUCED_REQUIRE_MEMBER_TRAIT)
+
+#if !defined(BOOST_ASIO_HAS_DEDUCED_PREFER_MEMBER_TRAIT)
+
+template <typename Prop>
+struct prefer_member<any_completion_executor, Prop> :
+  prefer_member<any_completion_executor::base_type, Prop>
+{
+  typedef any_completion_executor result_type;
+};
+
+#endif // !defined(BOOST_ASIO_HAS_DEDUCED_PREFER_MEMBER_TRAIT)
+
+} // namespace traits
+
+#endif // !defined(GENERATING_DOCUMENTATION)
+
+#endif // defined(BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT)
+
+} // namespace asio
+} // namespace boost
+
+#include <boost/asio/detail/pop_options.hpp>
+
+#if defined(BOOST_ASIO_HEADER_ONLY) \
+  && !defined(BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT)
+# include <boost/asio/impl/any_completion_executor.ipp>
+#endif // defined(BOOST_ASIO_HEADER_ONLY)
+       //   && !defined(BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT)
+
+#endif // BOOST_ASIO_ANY_COMPLETION_EXECUTOR_HPP