passenger 6.0.14 → 6.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa9f755880c3ddfc5cae56059e6b3f8842fc49fc
-  data.tar.gz: 275c6684a9f3f6d2645f5b443542754722956e82
+  metadata.gz: 6ed286b35fe2afc9916972e242806d8ef6f38996
+  data.tar.gz: d0286a8f800b66ebb734da79ef381e8886b8c542
 SHA512:
-  metadata.gz: 2f8b9e118657c0e208cfe8628ba189bf611fe2b92fcebdbbc99d2b0a38653a0c1f4f85b4e0a48119c2ba37d75dceed8bcc4cbfb0fe76f17be16060859be9a4d8
-  data.tar.gz: 90729494b5e3d8b0c908778c12069537aeb8821144e7eb1f9f811e8d5a12a28759fb601a6eeb3892fb0b407143b5062bf85f5fb37d8f50a54733b40c33adef45
+  metadata.gz: 7c654ed76d439bdc87b06986fdd651d198c3f5334f589705a0d616545fff738b2f096962a437cdf65379bf6c9c809c833c8f9f19d604ef8fe0a64c4d5d345551
+  data.tar.gz: c6a215512170735670e7a33ac43010cc02e72560aec30899154e2828cd7860ae3f83c4fc028d8c9556cde045deaf02e79a04b91a3458949582360b28ef2293bb

data/CHANGELOG

@@ -1,5 +1,55 @@
-Release 6.0.14 (Not yet released)
+Release 6.0.16 (Not yet released)
 -------------
+ * 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.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+   - ccache: 4.6.3 → 4.7.4
+   - cmake: 3.24.2 → 3.25.1
+   - curl: 7.85.0 → 7.86.0
+   - git 2.37.3 → 2.38.1
+   - gnupg: 2.3.7 → 2.3.8
+   - libgpg_error 1.45 → 1.46
+   - libksba 1.6.1 → 1.6.2
+   - openssl: 1.1.1q → 1.1.1s
+   - rubygems 3.3.22 → 3.3.26
+   - s3cmd 2.2.0 → 2.3.0
+   - zlib: 1.2.12 → 1.2.13
+   - rubies:
+     - 2.7.6 → 2.7.7
+     - 3.0.4 → 3.0.5
+     - 3.1.2 → 3.1.3
+
+
+Release 6.0.15
+-------------
+ * Restore ability to build against upstream libev. Contributed by Antonio Terceiro. Closes GH-1544.
+ * Improve rvm gemset detection. Closes GH-2420.
+ * Fix watchdog error on disable-log-prefix flag. Contributed by Paul Hanyzewski. Closes GH-2363.
+ * Upgrades Boost to 1.80.
+ * Fixed compilation on some platforms by explicitly using the stl queue. Closes GH-2440.
+ * Raise an error in case rack gets an ENOBUFS error. Contributed by Mathieu Jobin.
+ * Fixes interaction between preload bundler option and setenv RUBYOPT option. Closes GH-2424.
+ * Add rpm packages for el9 (RHEL, Rocky, Alma). Closes GH-2431.
+ * Upgrade jsoncpp to 1.9.5.
+ * Improve Solaris support for 11.3 & 11.4.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+ - ccache: 4.6 → 4.6.3
+ - cmake: 3.23.1 → 3.24.2
+ - curl: 7.82.0 → 7.85.0
+ - git: 2.36.0 → 2.37.3
+ - gnupg: 2.3.5 → 2.3.7
+ - libiconv: 1.16 → 1.17
+ - libksba: 1.6.0 → 1.6.1
+ - openssl: 1.1.1n → 1.1.1q
+ - pinentry: 1.2.0 → 1.2.1
+ - rubygems: 3.3.12 → 3.3.22
+
+
+Release 6.0.14
+-------------
+ * Removes use of rexml in passenger restart command, because it was removed from Ruby 3. Closes GH-2415.
  * Adds Ubuntu 22.04 "Jammy" packages, and removes Ubuntu 21.10 "Impish" packages.
  * Fixes a use after free regression introduced in 6.0.12.
  * Fixed a warning about ERB.new argument deprecation in Ruby 3.1. Closes GH-2417.

data/CONTRIBUTORS

@@ -71,6 +71,7 @@ Luuk Hendriks (Phusion)
 MAEDA Go
 Magnus Holm
 Mark R. James
+Mathieu Jobin
 Matt Ozinga
 Michal Papis
 Michał Pokrywka
@@ -86,6 +87,7 @@ Oleksiy Shchukin
 Olle Jonsson
 Pat Downey
 Paul B
+Paul Hanyzewski
 Paul Kmiec
 Pepijn Looije
 Perry Smith

data/build/common_library.rb

@@ -110,6 +110,7 @@ if USE_VENDORED_LIBEV
     result = '-Isrc/cxx_supportlib/vendor-modified/libev'
     # Apple Clang 4.2 complains about ambiguous member templates in ev++.h.
     result << ' -Wno-ambiguous-member-template' if PlatformInfo.compiler_supports_wno_ambiguous_member_template?
+    result << ' -DUSE_VENDORED_LIBEV'
     result
   end
 

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.14")
+ *   server_software                                                 string             -          default("Phusion_Passenger/6.0.16")
  *   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.14")
+ *   server_software                                     string             -          default("Phusion_Passenger/6.0.16")
  *   show_version_in_header                              boolean            -          default(true)
  *   start_reading_after_accept                          boolean            -          default(true)
  *   stat_throttle_rate                                  unsigned integer   -          default(10)

data/src/agent/SpawnEnvSetupper/SpawnEnvSetupperMain.cpp

@@ -686,6 +686,20 @@ setCurrentWorkingDirectory(const Context &context) {
 	setenv("PWD", appRoot.c_str(), 1);
 }
 
+string
+findRubyopt(const Json::Value &args) {
+	if (!args.isMember("environment_variables")) return "";
+	const Json::Value &envvars = args["environment_variables"];
+	Json::Value::const_iterator it, end = envvars.end();
+
+	for (it = envvars.begin(); it != end; it++) {
+		if (it.name() == "RUBYOPT") {
+			return it->asString();
+		}
+	}
+	return "";
+}
+
 static void
 setDefaultEnvvars(const Json::Value &args) {
 	setenv("PYTHONUNBUFFERED", "1", 1);
@@ -703,7 +717,8 @@ setDefaultEnvvars(const Json::Value &args) {
 	}
 
 	if (args.isMember("preload_bundler") && args["preload_bundler"].asBool()) {
-		setenv("RUBYOPT", "-r bundler/setup", 1);
+		string rubyopt = findRubyopt(args) + " -r bundler/setup";
+		setenv("RUBYOPT", rubyopt.c_str(), 1);
 	}
 
 	if (args["base_uri"].asString() != "/") {
@@ -724,7 +739,14 @@ setGivenEnvVars(const Json::Value &args) {
 
 	for (it = envvars.begin(); it != end; it++) {
 		string key = it.name();
-		setenv(key.c_str(), it->asCString(), 1);
+		string value = it->asString();
+		if(args.isMember("preload_bundler") &&
+		   args["preload_bundler"].asBool()){
+			if (key == "RUBYOPT") {
+				value += " -r bundler/setup";
+			}
+		}
+		setenv(key.c_str(), value.c_str(), 1);
 	}
 }
 

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.14")
+ *   server_software                                                          string             -          default("Phusion_Passenger/6.0.16")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only

data/src/agent/Watchdog/WatchdogMain.cpp

@@ -671,6 +671,7 @@ usage() {
 	printf("      --no-delete-pid-file    Do not delete PID file on exit\n");
 	printf("      --log-file PATH         Log to the given file.\n");
 	printf("      --log-level LEVEL       Logging level. [A] Default: %d\n", DEFAULT_LOG_LEVEL);
+	printf("      --disable-log-prefix    Disables prefixing application logs with App PID stdout\n");
 	printf("      --report-file PATH      Upon successful initialization, report instance\n");
 	printf("                              information to the given file, in JSON format\n");
 	printf("      --cleanup-pidfile PATH  Upon shutdown, kill the process specified by\n");
@@ -813,6 +814,9 @@ parseOptions(int argc, const char *argv[], ConfigKit::Store &config) {
 		} else if (p.isValueFlag(argc, i, argv[i], '\0', "--log-file")) {
 			updates["log_target"] = argv[i + 1];
 			i += 2;
+		} else if (p.isFlag(argv[i], '\0', "--disable-log-prefix")) {
+			updates["disable_log_prefix"] = true;
+			i++;
 		} else if (p.isValueFlag(argc, i, argv[i], '\0', "--ctl")) {
 			const char *value = strchr(argv[i + 1], '=');
 			if (value == NULL) {

data/src/cxx_supportlib/BackgroundEventLoop.cpp

@@ -269,11 +269,15 @@ BackgroundEventLoop::BackgroundEventLoop(bool scalable, bool usesLibuv)
 		throw RuntimeException("Cannot create a libev event loop");
 	}
 
+	#ifdef USE_VENDORED_LIBEV
 	P_LOG_FILE_DESCRIPTOR_OPEN2(ev_backend_fd(libev_loop), "libev event loop: backend FD");
+	#endif
 
 	ev_async_init(&priv->exitSignaller, signalLibevExit);
+	#ifdef USE_VENDORED_LIBEV
 	P_LOG_FILE_DESCRIPTOR_OPEN2(ev_loop_get_pipe(libev_loop, 0), "libev event loop: async pipe 0");
 	P_LOG_FILE_DESCRIPTOR_OPEN2(ev_loop_get_pipe(libev_loop, 1), "libev event loop: async pipe 1");
+	#endif
 	priv->exitSignaller.data = this;
 	safe = boost::make_shared<SafeLibev>(libev_loop);
 

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.14"
+#define PASSENGER_VERSION "6.0.16"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"

data/src/cxx_supportlib/LoggingKit/Context.h

@@ -78,7 +78,7 @@ private:
 	mutable boost::mutex gcSyncher;
 	oxt::thread *gcThread;
 	boost::condition_variable gcShuttingDownCond, gcHasShutDownCond;
-	queue< pair<ConfigRealization *, MonotonicTimeUsec> > oldConfigs;
+	std::queue< pair<ConfigRealization *, MonotonicTimeUsec> > oldConfigs;
 	bool shuttingDown;
 
 	struct TimestampedLog {

data/src/cxx_supportlib/SafeLibev.h

@@ -147,9 +147,11 @@ public:
 
 	~SafeLibev() {
 		destroy();
+		#ifdef USE_VENDORED_LIBEV
 		P_LOG_FILE_DESCRIPTOR_CLOSE(ev_loop_get_pipe(loop, 0));
 		P_LOG_FILE_DESCRIPTOR_CLOSE(ev_loop_get_pipe(loop, 1));
 		P_LOG_FILE_DESCRIPTOR_CLOSE(ev_backend_fd(loop));
+		#endif
 		ev_loop_destroy(loop);
 	}
 

data/src/cxx_supportlib/vendor-modified/boost/algorithm/string/detail/find_iterator.hpp

@@ -40,10 +40,18 @@ namespace boost {
             // Protected construction/destruction
 
                 // Default constructor
-                find_iterator_base() {}
+                BOOST_DEFAULTED_FUNCTION(find_iterator_base(), {})
+
                 // Copy construction
-                find_iterator_base( const find_iterator_base& Other ) :
+                BOOST_DEFAULTED_FUNCTION(find_iterator_base( const find_iterator_base& Other ), :
                     m_Finder(Other.m_Finder) {}
+                )
+
+                // Assignment
+                BOOST_DEFAULTED_FUNCTION(find_iterator_base& operator=( const find_iterator_base& Other ), {
+                    m_Finder = Other.m_Finder;
+                    return *this;
+                })
                 
                 // Constructor
                 template<typename FinderT>
@@ -51,7 +59,7 @@ namespace boost {
                     m_Finder(Finder) {}
 
                 // Destructor
-                ~find_iterator_base() {}
+                BOOST_DEFAULTED_FUNCTION(~find_iterator_base(), {})
 
                 // Find operation
                 match_type do_find( 

data/src/cxx_supportlib/vendor-modified/boost/algorithm/string/find_iterator.hpp

@@ -74,7 +74,7 @@ namespace boost {
 
                 \post eof()==true
             */
-            find_iterator() {}
+            BOOST_DEFAULTED_FUNCTION(find_iterator(), {})
 
             //! Copy constructor
             /*!
@@ -85,6 +85,18 @@ namespace boost {
                 m_Match(Other.m_Match),
                 m_End(Other.m_End) {}
 
+            //! Copy assignment
+            /*!
+                Assigns a copy of the find_iterator
+            */
+            BOOST_DEFAULTED_FUNCTION(find_iterator& operator=( const find_iterator& Other ), {
+                if (this == &Other) return *this;
+                this->base_type::operator=(Other);
+                m_Match = Other.m_Match;
+                m_End = Other.m_End;
+                return *this;
+            })
+
             //! Constructor
             /*!
                 Construct new find_iterator for a given finder
@@ -248,6 +260,20 @@ namespace boost {
                 m_bEof(Other.m_bEof)
             {}
 
+            //! Assignment operator
+            /*!
+                Assigns a copy of the split_iterator
+            */
+            BOOST_DEFAULTED_FUNCTION(split_iterator& operator=( const split_iterator& Other ), {
+                if (this == &Other) return *this;
+                this->base_type::operator=(Other);
+                m_Match = Other.m_Match;
+                m_Next = Other.m_Next;
+                m_End = Other.m_End;
+                m_bEof = Other.m_bEof;
+                return *this;
+            })
+
             //! Constructor
             /*!
                 Construct new split_iterator for a given finder

data/src/cxx_supportlib/vendor-modified/boost/align/detail/aligned_alloc_sunos.hpp

@@ -0,0 +1,34 @@
+/*
+Copyright 2014 Glen Joseph Fernandes
+(glenjofe@gmail.com)
+
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
+*/
+#ifndef BOOST_ALIGN_DETAIL_ALIGNED_ALLOC_SUNOS_HPP
+#define BOOST_ALIGN_DETAIL_ALIGNED_ALLOC_SUNOS_HPP
+
+#include <boost/align/detail/is_alignment.hpp>
+#include <boost/assert.hpp>
+#include <stdlib.h>
+
+namespace boost {
+namespace alignment {
+
+inline void*
+aligned_alloc(std::size_t alignment, std::size_t size) BOOST_NOEXCEPT
+{
+    BOOST_ASSERT(detail::is_alignment(alignment));
+    return ::memalign(alignment, size);
+}
+
+inline void
+aligned_free(void* ptr) BOOST_NOEXCEPT
+{
+    ::free(ptr);
+}
+
+} /* alignment */
+} /* boost */
+
+#endif

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

@@ -2,7 +2,7 @@
 // any_io_executor.hpp
 // ~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// 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)
@@ -88,29 +88,17 @@ public:
 #endif // !defined(GENERATING_DOCUMENTATION)
 
   /// Default constructor.
-  any_io_executor() BOOST_ASIO_NOEXCEPT
-    : base_type()
-  {
-  }
+  BOOST_ASIO_DECL any_io_executor() BOOST_ASIO_NOEXCEPT;
 
   /// Construct in an empty state. Equivalent effects to default constructor.
-  any_io_executor(nullptr_t) BOOST_ASIO_NOEXCEPT
-    : base_type(nullptr_t())
-  {
-  }
+  BOOST_ASIO_DECL any_io_executor(nullptr_t) BOOST_ASIO_NOEXCEPT;
 
   /// Copy constructor.
-  any_io_executor(const any_io_executor& e) BOOST_ASIO_NOEXCEPT
-    : base_type(static_cast<const base_type&>(e))
-  {
-  }
+  BOOST_ASIO_DECL any_io_executor(const any_io_executor& e) BOOST_ASIO_NOEXCEPT;
 
 #if defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
   /// Move constructor.
-  any_io_executor(any_io_executor&& e) BOOST_ASIO_NOEXCEPT
-    : base_type(static_cast<base_type&&>(e))
-  {
-  }
+  BOOST_ASIO_DECL any_io_executor(any_io_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.
@@ -159,38 +147,23 @@ public:
 #endif // defined(GENERATING_DOCUMENTATION)
 
   /// Assignment operator.
-  any_io_executor& operator=(const any_io_executor& e) BOOST_ASIO_NOEXCEPT
-  {
-    base_type::operator=(static_cast<const base_type&>(e));
-    return *this;
-  }
+  BOOST_ASIO_DECL any_io_executor& operator=(
+      const any_io_executor& e) BOOST_ASIO_NOEXCEPT;
 
 #if defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
   /// Move assignment operator.
-  any_io_executor& operator=(any_io_executor&& e) BOOST_ASIO_NOEXCEPT
-  {
-    base_type::operator=(static_cast<base_type&&>(e));
-    return *this;
-  }
+  BOOST_ASIO_DECL any_io_executor& operator=(
+      any_io_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.
-  any_io_executor& operator=(nullptr_t)
-  {
-    base_type::operator=(nullptr_t());
-    return *this;
-  }
+  BOOST_ASIO_DECL any_io_executor& operator=(nullptr_t);
 
   /// Destructor.
-  ~any_io_executor()
-  {
-  }
+  BOOST_ASIO_DECL ~any_io_executor();
 
   /// Swap targets with another polymorphic wrapper.
-  void swap(any_io_executor& other) BOOST_ASIO_NOEXCEPT
-  {
-    static_cast<base_type&>(*this).swap(static_cast<base_type&>(other));
-  }
+  BOOST_ASIO_DECL void swap(any_io_executor& other) BOOST_ASIO_NOEXCEPT;
 
   /// Obtain a polymorphic wrapper with the specified property.
   /**
@@ -231,6 +204,30 @@ public:
 
 #if !defined(GENERATING_DOCUMENTATION)
 
+template <>
+BOOST_ASIO_DECL any_io_executor any_io_executor::require(
+    const execution::blocking_t::never_t&, int) const;
+
+template <>
+BOOST_ASIO_DECL any_io_executor any_io_executor::prefer(
+    const execution::blocking_t::possibly_t&, int) const;
+
+template <>
+BOOST_ASIO_DECL any_io_executor any_io_executor::prefer(
+    const execution::outstanding_work_t::tracked_t&, int) const;
+
+template <>
+BOOST_ASIO_DECL any_io_executor any_io_executor::prefer(
+    const execution::outstanding_work_t::untracked_t&, int) const;
+
+template <>
+BOOST_ASIO_DECL any_io_executor any_io_executor::prefer(
+    const execution::relationship_t::fork_t&, int) const;
+
+template <>
+BOOST_ASIO_DECL any_io_executor any_io_executor::prefer(
+    const execution::relationship_t::continuation_t&, int) const;
+
 namespace traits {
 
 #if !defined(BOOST_ASIO_HAS_DEDUCED_EQUALITY_COMPARABLE_TRAIT)
@@ -299,4 +296,10 @@ struct prefer_member<any_io_executor, Prop> :
 
 #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_io_executor.ipp>
+#endif // defined(BOOST_ASIO_HEADER_ONLY)
+       //   && !defined(BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT)
+
 #endif // BOOST_ASIO_ANY_IO_EXECUTOR_HPP

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

@@ -0,0 +1,80 @@
+//
+// append.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_APPEND_HPP
+#define BOOST_ASIO_APPEND_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_HAS_STD_TUPLE) \
+    && defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)) \
+  || defined(GENERATING_DOCUMENTATION)
+
+#include <tuple>
+#include <boost/asio/detail/type_traits.hpp>
+
+#include <boost/asio/detail/push_options.hpp>
+
+namespace boost {
+namespace asio {
+
+/// Completion token type used to specify that the completion handler
+/// arguments should be passed additional values after the results of the
+/// operation.
+template <typename CompletionToken, typename... Values>
+class append_t
+{
+public:
+  /// Constructor.
+  template <typename T, typename... V>
+  BOOST_ASIO_CONSTEXPR explicit append_t(
+      BOOST_ASIO_MOVE_ARG(T) completion_token,
+      BOOST_ASIO_MOVE_ARG(V)... values)
+    : token_(BOOST_ASIO_MOVE_CAST(T)(completion_token)),
+      values_(BOOST_ASIO_MOVE_CAST(V)(values)...)
+  {
+  }
+
+//private:
+  CompletionToken token_;
+  std::tuple<Values...> values_;
+};
+
+/// Completion token type used to specify that the completion handler
+/// arguments should be passed additional values after the results of the
+/// operation.
+template <typename CompletionToken, typename... Values>
+BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONSTEXPR append_t<
+  typename decay<CompletionToken>::type, typename decay<Values>::type...>
+append(BOOST_ASIO_MOVE_ARG(CompletionToken) completion_token,
+    BOOST_ASIO_MOVE_ARG(Values)... values)
+{
+  return append_t<
+    typename decay<CompletionToken>::type, typename decay<Values>::type...>(
+      BOOST_ASIO_MOVE_CAST(CompletionToken)(completion_token),
+      BOOST_ASIO_MOVE_CAST(Values)(values)...);
+}
+
+} // namespace asio
+} // namespace boost
+
+#include <boost/asio/detail/pop_options.hpp>
+
+#include <boost/asio/impl/append.hpp>
+
+#endif // (defined(BOOST_ASIO_HAS_STD_TUPLE)
+       //     && defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES))
+       //   || defined(GENERATING_DOCUMENTATION)
+
+#endif // BOOST_ASIO_APPEND_HPP