passenger 6.0.20 → 6.0.21

data/src/cxx_supportlib/StrIntTools/StrIntUtils.h

@@ -129,6 +129,11 @@ string fillInMiddle(unsigned int max, const string &prefix, const string &middle
  */
 bool startsWith(const StaticString &str, const StaticString &substr);
 
+/**
+ * Checks whether <tt>str</tt> ends with <tt>substr</tt>.
+ */
+bool endsWith(const StaticString &str, const StaticString &substr);
+
 /**
  * Split the given string using the given separator. Excludes the
  * separator from the output.

data/src/cxx_supportlib/SystemTools/SystemMetricsCollector.h

@@ -835,8 +835,8 @@ private:
 		void updateCpuMetrics(SystemMetrics::CpuUsage &cpuUsage, long long user, long long nice,
 			long long sys, long long iowait, long long idle, long long steal) const
 		{
-			unsigned long long userDiff, niceDiff, systemDiff, ioWaitDiff,
-				idleDiff, stealDiff;
+			unsigned long long userDiff, niceDiff, systemDiff, idleDiff,
+				ioWaitDiff = 0, stealDiff = 0;
 			double totalCalculationTicks, totalTicks;
 
 			userDiff   = (unsigned long long) user - cpuUsage.lastUserTicks;

data/src/cxx_supportlib/SystemTools/UserDatabase.cpp

@@ -136,7 +136,7 @@ lookupSystemGroupByGid(gid_t gid, OsGroup &result) {
 }
 
 string
-lookupSystemUsernameByUid(uid_t uid, const StaticString &fallbackFormat) {
+lookupSystemUsernameByUid(uid_t uid, bool fallback) {
 	OsUser user;
 	bool result;
 
@@ -149,20 +149,21 @@ lookupSystemUsernameByUid(uid_t uid, const StaticString &fallbackFormat) {
 	if (result && user.pwd.pw_name != NULL && user.pwd.pw_name[0] != '\0') {
 		return user.pwd.pw_name;
 	} else {
-		// Null terminate fallback format string
-		DynamicBuffer fallbackFormatNt(fallbackFormat.size() + 1);
-		memcpy(fallbackFormatNt.data, fallbackFormat.data(), fallbackFormat.size());
-		fallbackFormatNt.data[fallbackFormat.size()] = '\0';
-
 		char buf[512];
-		snprintf(buf, sizeof(buf), fallbackFormatNt.data, (int) uid);
+
+		if (fallback) {
+			snprintf(buf, sizeof(buf), "%d", (int) uid);
+		} else {
+			snprintf(buf, sizeof(buf), "UID %d", (int) uid);
+		}
+
 		buf[sizeof(buf) - 1] = '\0';
 		return buf;
 	}
 }
 
 string
-lookupSystemGroupnameByGid(gid_t gid, const StaticString &fallbackFormat) {
+lookupSystemGroupnameByGid(gid_t gid, bool fallback) {
 	OsGroup group;
 	bool result;
 
@@ -175,13 +176,12 @@ lookupSystemGroupnameByGid(gid_t gid, const StaticString &fallbackFormat) {
 	if (result && group.grp.gr_name != NULL && group.grp.gr_name[0] != '\0') {
 		return group.grp.gr_name;
 	} else {
-		// Null terminate fallback format string
-		DynamicBuffer fallbackFormatNt(fallbackFormat.size() + 1);
-		memcpy(fallbackFormatNt.data, fallbackFormat.data(), fallbackFormat.size());
-		fallbackFormatNt.data[fallbackFormat.size()] = '\0';
-
 		char buf[512];
-		snprintf(buf, sizeof(buf), fallbackFormatNt.data, (int) gid);
+		if (fallback) {
+			snprintf(buf, sizeof(buf), "%d", (int) gid);
+		} else {
+			snprintf(buf, sizeof(buf), "GID %d", (int) gid);
+		}
 		buf[sizeof(buf) - 1] = '\0';
 		return buf;
 	}

data/src/cxx_supportlib/SystemTools/UserDatabase.h

@@ -117,24 +117,20 @@ bool lookupSystemGroupByGid(gid_t gid, OsGroup &result);
 /**
  * Returns the username of the OS user account with the given UID. If no such
  * account exists or if that account has no name, then returns a string that
- * is printf-style formatted according to `fallbackFormat`.
+ * is printf-style formatted one of two ways, depending on `fallback`.
  *
- * `fallbackFormat` may contain at most one directive, which must be %d.
- * If it contains more than one directive then bad things may happen.
+ * if `fallback` is true the "%d" format string is used, otherwise "UID %d" is used.
  */
-string lookupSystemUsernameByUid(uid_t uid,
-	const StaticString &fallbackFormat = P_STATIC_STRING("UID %d"));
+string lookupSystemUsernameByUid(uid_t uid,	bool fallback=false);
 
 /**
  * Returns the group name of the OS group account with the given GID. If no such
  * account exists or if that account has no name, then returns a string that
- * is printf-style formatted according to `fallbackFormat`.
+ * is printf-style formatted one of two ways, depending on `fallback`.
  *
- * `fallbackFormat` may contain at most one directive, which must be %d.
- * If it contains more than one directive then bad things may happen.
+ * if `fallback` is true the "%d" format string is used, otherwise "GID %d" is used.
  */
-string lookupSystemGroupnameByGid(gid_t gid,
-	const StaticString &fallbackFormat = P_STATIC_STRING("GID %d"));
+string lookupSystemGroupnameByGid(gid_t gid, bool fallback=false);
 
 /**
  * Returns the home directory of the current user. This queries $HOME,

data/src/cxx_supportlib/Utils/AnsiColorConstants.h

@@ -25,14 +25,16 @@
  */
 #ifndef _PASSENGER_ANSI_COLOR_CONSTANTS_H_
 
-#define ANSI_COLOR_RESET    "\e[0m"
-#define ANSI_COLOR_BOLD     "\e[1m"
-#define ANSI_COLOR_DGRAY    "\e[90m"
-#define ANSI_COLOR_RED      "\e[31m"
-#define ANSI_COLOR_GREEN    "\e[32m"
-#define ANSI_COLOR_YELLOW   "\e[33m"
-#define ANSI_COLOR_WHITE    "\e[37m"
-#define ANSI_COLOR_BLACK_BG "\e[40m"
-#define ANSI_COLOR_BLUE_BG  "\e[44m"
+// '\033' == '\e' aka escape
+
+#define ANSI_COLOR_RESET    "\033[0m"
+#define ANSI_COLOR_BOLD     "\033[1m"
+#define ANSI_COLOR_DGRAY    "\033[90m"
+#define ANSI_COLOR_RED      "\033[31m"
+#define ANSI_COLOR_GREEN    "\033[32m"
+#define ANSI_COLOR_YELLOW   "\033[33m"
+#define ANSI_COLOR_WHITE    "\033[37m"
+#define ANSI_COLOR_BLACK_BG "\033[40m"
+#define ANSI_COLOR_BLUE_BG  "\033[44m"
 
 #endif /* _PASSENGER_ANSI_COLOR_CONSTANTS_H_ */

data/src/cxx_supportlib/Utils.cpp

@@ -123,7 +123,7 @@ escapeShell(const StaticString &value) {
 	const char *end = value.data() + value.size();
 	string result;
 
-	result.reserve(value.size() * 1.5);
+	result.reserve((value.size() * 3) / 2);
 
 	while (pos < end) {
 		char ch = *pos;

data/src/cxx_supportlib/oxt/implementation.cpp

@@ -28,6 +28,7 @@
 #include <boost/make_shared.hpp>
 #include "tracable_exception.hpp"
 #include "backtrace.hpp"
+#include "initialize.hpp"
 #include "macros.hpp"
 #include "thread.hpp"
 #include "spin_lock.hpp"
@@ -330,8 +331,6 @@ void
 initialize() {
 	global_context = new global_context_t();
 	init_thread_local_context_support();
-	// For some reason make_shared() crashes here when compiled with clang 3.2 on OS X.
-	// Clang bug? We use 'new' to work around it.
 	thread_local_context_ptr ctx = thread_local_context::make_shared_ptr();
 	ctx->thread_number = 1;
 	ctx->thread_name = "Main thread";

data/src/cxx_supportlib/oxt/system_calls.cpp

@@ -635,7 +635,7 @@ syscalls::nanosleep(const struct timespec *req, struct timespec *rem) {
 	struct timespec req2 = *req;
 	struct timespec rem2;
 	int ret, e;
-	bool intr_requested;
+	bool intr_requested = false;
 
 	/* We never simulate failure in this function. */
 

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

@@ -2,7 +2,7 @@
 // any_completion_executor.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 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,20 +76,18 @@ public:
 #endif // !defined(GENERATING_DOCUMENTATION)
 
   /// Default constructor.
-  BOOST_ASIO_DECL any_completion_executor() BOOST_ASIO_NOEXCEPT;
+  BOOST_ASIO_DECL any_completion_executor() noexcept;
 
   /// Construct in an empty state. Equivalent effects to default constructor.
-  BOOST_ASIO_DECL any_completion_executor(nullptr_t) BOOST_ASIO_NOEXCEPT;
+  BOOST_ASIO_DECL any_completion_executor(nullptr_t) noexcept;
 
   /// Copy constructor.
   BOOST_ASIO_DECL any_completion_executor(
-      const any_completion_executor& e) BOOST_ASIO_NOEXCEPT;
+      const any_completion_executor& e) 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)
+      any_completion_executor&& e) noexcept;
 
   /// Construct to point to the same target as another any_executor.
 #if defined(GENERATING_DOCUMENTATION)
@@ -99,7 +97,7 @@ public:
 #else // defined(GENERATING_DOCUMENTATION)
   template <typename OtherAnyExecutor>
   any_completion_executor(OtherAnyExecutor e,
-      typename constraint<
+      constraint_t<
         conditional<
           !is_same<OtherAnyExecutor, any_completion_executor>::value
             && is_base_of<execution::detail::any_executor_base,
@@ -109,8 +107,8 @@ public:
               is_valid_target<OtherAnyExecutor>,
           false_type
         >::type::value
-      >::type = 0)
-    : base_type(BOOST_ASIO_MOVE_CAST(OtherAnyExecutor)(e))
+      > = 0)
+    : base_type(static_cast<OtherAnyExecutor&&>(e))
   {
   }
 #endif // defined(GENERATING_DOCUMENTATION)
@@ -123,7 +121,7 @@ public:
 #else // defined(GENERATING_DOCUMENTATION)
   template <typename OtherAnyExecutor>
   any_completion_executor(std::nothrow_t, OtherAnyExecutor e,
-      typename constraint<
+      constraint_t<
         conditional<
           !is_same<OtherAnyExecutor, any_completion_executor>::value
             && is_base_of<execution::detail::any_executor_base,
@@ -133,21 +131,19 @@ public:
               is_valid_target<OtherAnyExecutor>,
           false_type
         >::type::value
-      >::type = 0) BOOST_ASIO_NOEXCEPT
-    : base_type(std::nothrow, BOOST_ASIO_MOVE_CAST(OtherAnyExecutor)(e))
+      > = 0) noexcept
+    : base_type(std::nothrow, static_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;
+      const any_completion_executor& e) 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)
+      any_completion_executor&& e) noexcept;
 
   /// Construct a polymorphic wrapper for the specified executor.
 #if defined(GENERATING_DOCUMENTATION)
@@ -156,7 +152,7 @@ public:
 #else // defined(GENERATING_DOCUMENTATION)
   template <BOOST_ASIO_EXECUTION_EXECUTOR Executor>
   any_completion_executor(Executor e,
-      typename constraint<
+      constraint_t<
         conditional<
           !is_same<Executor, any_completion_executor>::value
             && !is_base_of<execution::detail::any_executor_base,
@@ -165,8 +161,8 @@ public:
             Executor, supportable_properties_type>,
           false_type
         >::type::value
-      >::type = 0)
-    : base_type(BOOST_ASIO_MOVE_CAST(Executor)(e))
+      > = 0)
+    : base_type(static_cast<Executor&&>(e))
   {
   }
 #endif // defined(GENERATING_DOCUMENTATION)
@@ -178,7 +174,7 @@ public:
 #else // defined(GENERATING_DOCUMENTATION)
   template <BOOST_ASIO_EXECUTION_EXECUTOR Executor>
   any_completion_executor(std::nothrow_t, Executor e,
-      typename constraint<
+      constraint_t<
         conditional<
           !is_same<Executor, any_completion_executor>::value
             && !is_base_of<execution::detail::any_executor_base,
@@ -187,21 +183,19 @@ public:
             Executor, supportable_properties_type>,
           false_type
         >::type::value
-      >::type = 0) BOOST_ASIO_NOEXCEPT
-    : base_type(std::nothrow, BOOST_ASIO_MOVE_CAST(Executor)(e))
+      > = 0) noexcept
+    : base_type(std::nothrow, static_cast<Executor&&>(e))
   {
   }
 #endif // defined(GENERATING_DOCUMENTATION)
 
   /// Assignment operator.
   BOOST_ASIO_DECL any_completion_executor& operator=(
-      const any_completion_executor& e) BOOST_ASIO_NOEXCEPT;
+      const any_completion_executor& e) 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)
+      any_completion_executor&& e) noexcept;
 
   /// Assignment operator that sets the polymorphic wrapper to the empty state.
   BOOST_ASIO_DECL any_completion_executor& operator=(nullptr_t);
@@ -210,7 +204,7 @@ public:
   BOOST_ASIO_DECL ~any_completion_executor();
 
   /// Swap targets with another polymorphic wrapper.
-  BOOST_ASIO_DECL void swap(any_completion_executor& other) BOOST_ASIO_NOEXCEPT;
+  BOOST_ASIO_DECL void swap(any_completion_executor& other) noexcept;
 
   /// Obtain a polymorphic wrapper with the specified property.
   /**
@@ -223,9 +217,9 @@ public:
    */
   template <typename Property>
   any_completion_executor require(const Property& p,
-      typename constraint<
+      constraint_t<
         traits::require_member<const base_type&, const Property&>::is_valid
-      >::type = 0) const
+      > = 0) const
   {
     return static_cast<const base_type&>(*this).require(p);
   }
@@ -241,9 +235,9 @@ public:
    */
   template <typename Property>
   any_completion_executor prefer(const Property& p,
-      typename constraint<
+      constraint_t<
         traits::prefer_member<const base_type&, const Property&>::is_valid
-      >::type = 0) const
+      > = 0) const
   {
     return static_cast<const base_type&>(*this).prefer(p);
   }