passenger 6.0.27 → 6.1.0

data/dev/index_cxx_dependencies.rb

@@ -43,6 +43,10 @@ EXCLUDE_NAMES = %w{
   deque
   queue
   limits
+  thread
+  atomic
+  mutex
+  condition_variable
   hash_map
   ext/hash_map
   cctype

data/package.json

@@ -14,7 +14,7 @@
     "express": "^4.19.2",
     "jquery": "^3.7.1",
     "mini-css-extract-plugin": "^2.7.6",
-    "mocha": "^9.2.2",
+    "mocha": "^11.1.0",
     "multer": "^1.4.4-lts.1",
     "preact": "^8.5.3",
     "should": "^2.1.1",

data/src/agent/Core/ApplicationPool/Implementation.cpp

@@ -193,7 +193,7 @@ void processAndLogNewSpawnException(SpawningKit::SpawnException &e, const Option
 				getSystemTempDir());
 			fd = mkstemp(filename);
 		#endif
-		FdGuard guard(fd, NULL, 0, true);
+		FdGuard guard(fd, nullptr, 0);
 		if (fd == -1) {
 			int e = errno;
 			throw SystemException("Cannot generate a temporary filename",

data/src/agent/Core/ApplicationPool/Socket.h

@@ -89,10 +89,10 @@ private:
 	Connection connect() const {
 		Connection connection;
 		P_TRACE(3, "Connecting to " << address);
-		NConnect_State state(address, __FILE__, __LINE__);
-		connection.ready = state.connectToServer();
+		auto result = createNonBlockingSocketConnection(address, __FILE__, __LINE__);
+		connection.ready = result.second;
 		connection.fail = true;
-		connection.fd = state.getFd().detach();
+		connection.fd = result.first;
 		connection.wantKeepAlive = false;
 		P_LOG_FILE_DESCRIPTOR_PURPOSE(connection.fd, "App " << pid << " connection");
 		return connection;

data/src/agent/Core/ApplicationPool/TestSession.h

@@ -207,10 +207,9 @@ public:
 								__FILE__, __LINE__);
 
 		// Create client socket (non-blocking)
-		NUnix_State clientState;
-		setupNonBlockingUnixSocket(clientState, socketPath, __FILE__, __LINE__);
-		bool immediatelyConnected = connectToUnixServer(clientState);
-		connection.first = std::move(clientState.fd);
+		auto nbcResult = createNonBlockingUnixSocketConnection( socketPath, __FILE__, __LINE__);
+		bool immediatelyConnected = nbcResult.second;
+		connection.first = FileDescriptor(nbcResult.first, nullptr, 0);
 
 		// Accept connection (blocking)
 		FileDescriptor serverSideFd(oxt::syscalls::accept(serverFd, NULL, NULL),

data/src/agent/Core/Config.h

@@ -40,7 +40,6 @@
 #include <ConfigKit/TableTranslator.h>
 #include <ConfigKit/PrefixTranslator.h>
 #include <ServerKit/Context.h>
-#include <ServerKit/llversion.h>
 #include <ServerKit/HttpServer.h>
 #include <WrapperRegistry/Registry.h>
 #include <Core/Controller/Config.h>
@@ -150,7 +149,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.27")
+ *   server_software                                                 string             -          default("Phusion_Passenger/6.1.0")
  *   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
@@ -353,10 +352,6 @@ private:
 
 		Json::Value updates;
 		updates["server_software"] = serverSoftware;
-		if (effectiveValues["integration_mode"].asString() == "standalone" &&
-			effectiveValues["standalone_engine"].asString()=="builtin") {
-			updates["web_server_version"] = llhttp_version();
-		}
 		return updates;
 	}
 

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

@@ -118,7 +118,7 @@ parseControllerBenchmarkMode(const StaticString &mode) {
  *   old_routing                                         boolean            -          default(false),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.27")
+ *   server_software                                     string             -          default("Phusion_Passenger/6.1.0")
  *   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/CoreMain.cpp

@@ -88,6 +88,7 @@
 #include <Utils.h>
 #include <Utils/Timer.h>
 #include <IOTools/MessageIO.h>
+#include <IOTools/IOUtils.h>
 #include <Core/OptionParser.h>
 #include <Core/Controller.h>
 #include <Core/ApiServer.h>

data/src/agent/Core/SecurityUpdateChecker.h

@@ -33,6 +33,7 @@
 #include <oxt/backtrace.hpp>
 
 #include <SecurityKit/Crypto.h>
+#include <ServerKit/llversion.h>
 #include <ResourceLocator.h>
 #include <Exceptions.h>
 #include <StaticString.h>
@@ -568,7 +569,15 @@ public:
 		bodyJson["passenger_version"] = PASSENGER_VERSION;
 
 		bodyJson["server_integration"] = sessionState.config["server_identifier"];
-		bodyJson["server_version"] = sessionState.config["web_server_version"];
+
+		if (bodyJson["server_integration"].asString() == "standalone" &&
+			sessionState.config["web_server_version"].isNull()) {
+			P_INFO("Config web server version was Null while using standalone integration, assuming builtin engine.");
+			bodyJson["server_version"] = llhttp_version();
+		}else {
+			bodyJson["server_version"] = sessionState.config["web_server_version"];
+		}
+
 		bodyJson["curl_static"] = isCurlStaticallyLinked();
 
 		string nonce;

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

@@ -28,7 +28,6 @@
 
 #include <oxt/tracable_exception.hpp>
 #include <string>
-#include <stdexcept>
 #include <limits>
 
 #include <Constants.h>

data/src/agent/Core/SpawningKit/Handshake/Perform.h

@@ -34,7 +34,7 @@
 #include <oxt/backtrace.hpp>
 #include <string>
 #include <vector>
-#include <stdexcept>
+#include <exception>
 #include <cstddef>
 #include <cstdlib>
 #include <cerrno>
@@ -50,6 +50,7 @@
 #include <FileDescriptor.h>
 #include <FileTools/FileManip.h>
 #include <FileTools/PathManip.h>
+#include <IOTools/IOUtils.h>
 #include <Utils.h>
 #include <Utils/ScopeGuard.h>
 #include <SystemTools/SystemTime.h>
@@ -196,8 +197,18 @@ private:
 
 		while (true) {
 			unsigned long long timeout = 100000;
+			bool pingable;
 
-			if (pingTcpServer("127.0.0.1", session.expectedStartPort, &timeout)) {
+			try {
+				pingable = pingTcpServer("127.0.0.1", session.expectedStartPort, &timeout);
+			} catch (const std::exception &e) {
+				P_WARN("Error checking whether 127.0.0.1:" << session.expectedStartPort
+					<< " is connectable: " << e.what());
+				syscalls::usleep(50000);
+				continue;
+			}
+
+			if (pingable) {
 				boost::lock_guard<boost::mutex> l(syncher);
 				socketIsNowPingable = true;
 				finishState = FINISH_SUCCESS;

data/src/agent/Shared/Fundamentals/AbortHandler.cpp

@@ -550,10 +550,10 @@ dumpFileDescriptorInfo(AbortHandlerWorkingState &state) {
 }
 
 static void
-dumpWithCrashWatch(AbortHandlerWorkingState &state) {
+dumpWithCrashWatch(AbortHandlerWorkingState &state, bool toStderr) {
 	int fd = -1;
 
-	if (state.crashLogDirFd != -1) {
+	if (state.crashLogDirFd != -1 && !toStderr) {
 		fd = openat(state.crashLogDirFd, "backtrace.log", O_WRONLY | O_CREAT | O_TRUNC, 0600);
 		if (fd != -1) {
 			printCrashLogFileCreated(state, "backtrace.log");
@@ -594,7 +594,25 @@ dumpWithCrashWatch(AbortHandlerWorkingState &state) {
 		write_nowarn(STDERR_FILENO, state.messageBuf, pos - state.messageBuf);
 
 	} else {
-		waitpid(child, NULL, 0);
+		int status = -1;
+		int ret = waitpid(child, &status, 0);
+		int e = errno;
+		if (ret == -1 || status != 0) {
+			pos = state.messageBuf;
+			pos = ASSU::appendData(pos, end, "ERROR running 'crash-watch' (");
+			if (ret == -1) {
+				pos = ASSU::appendData(pos, end, "waitpid() failed, errno=");
+				pos = ASSU::appendInteger<int, 10>(pos, end, e);
+			} else if (WIFSIGNALED(status)) {
+				pos = ASSU::appendData(pos, end, "exited with signal ");
+				pos = ASSU::appendInteger<int, 10>(pos, end, WTERMSIG(status));
+			} else {
+				pos = ASSU::appendData(pos, end, "exit status ");
+				pos = ASSU::appendInteger<int, 10>(pos, end, WEXITSTATUS(status));
+			}
+			pos = ASSU::appendData(pos, end, ")\n");
+			write_nowarn(STDERR_FILENO, state.messageBuf, pos - state.messageBuf);
+		}
 	}
 
 	if (fd != -1) {
@@ -852,7 +870,7 @@ dumpDiagnostics(AbortHandlerWorkingState &state) {
 			pos = ASSU::appendData(pos, end, " ] Dumping a backtrace with crash-watch...\n");
 		#endif
 		write_nowarn(STDERR_FILENO, state.messageBuf, pos - state.messageBuf);
-		dumpWithCrashWatch(state);
+		dumpWithCrashWatch(state, ctx->config->dumpCrashWatchToStderr);
 	} else {
 		write_nowarn(STDERR_FILENO, "\n", 1);
 	}
@@ -969,7 +987,7 @@ forkAndRedirectToTeeAndMainLogFile(const char *crashLogDir) {
 		execlp("/usr/bin/cat", "cat", (char *) 0);
 		ASSU::printError("ERROR: cannot execute 'tee' or 'cat'; crash log will be lost!\n");
 		_exit(1);
-		return false;
+		return false; // Unreachable
 	} else if (pid == -1) {
 		ASSU::printError("ERROR: cannot fork a process for executing 'tee'\n");
 		return false;

data/src/agent/Shared/Fundamentals/AbortHandler.h

@@ -26,8 +26,6 @@
 #ifndef _PASSENGER_AGENT_FUNDAMENTALS_ABORT_HANDLER_H_
 #define _PASSENGER_AGENT_FUNDAMENTALS_ABORT_HANDLER_H_
 
-#include <cstddef>
-
 namespace Passenger {
 	class ResourceLocator;
 }
@@ -38,7 +36,7 @@ namespace Fundamentals {
 
 
 struct AbortHandlerConfig {
-	static const unsigned int MAX_DIAGNOSTICS_DUMPERS = 5;
+	static constexpr unsigned int MAX_DIAGNOSTICS_DUMPERS = 5;
 	typedef void (*DiagnosticsDumperFunc)(void *userData);
 
 	struct DiagnosticsDumper {
@@ -56,26 +54,16 @@ struct AbortHandlerConfig {
 	};
 
 
-	char *ruby;
-	char **origArgv;
-	unsigned int randomSeed;
-	bool dumpWithCrashWatch;
-	bool beep;
-	bool stopProcess;
-	bool forceTerminateProcess;
-	ResourceLocator *resourceLocator;
+	char *ruby = nullptr;
+	char **origArgv = nullptr;
+	unsigned int randomSeed = 0;
+	bool dumpWithCrashWatch = false;
+	bool dumpCrashWatchToStderr = false;
+	bool beep = false;
+	bool stopProcess = false;
+	bool forceTerminateProcess = false;
+	ResourceLocator *resourceLocator = nullptr;
 	DiagnosticsDumper diagnosticsDumpers[MAX_DIAGNOSTICS_DUMPERS];
-
-	AbortHandlerConfig()
-		: ruby(NULL),
-		  origArgv(NULL),
-		  randomSeed(0),
-		  dumpWithCrashWatch(false),
-		  beep(false),
-		  stopProcess(false),
-		  forceTerminateProcess(false),
-		  resourceLocator(NULL)
-		{ }
 };
 
 void installAbortHandler(const AbortHandlerConfig *config);

data/src/agent/Shared/Fundamentals/Initialization.cpp

@@ -465,6 +465,7 @@ maybeInitializeAbortHandler() {
 	config->origArgv = context->origArgv;
 	config->randomSeed = context->randomSeed;
 	config->dumpWithCrashWatch = getEnvBool("PASSENGER_DUMP_WITH_CRASH_WATCH", true);
+	config->dumpCrashWatchToStderr = getEnvBool("PASSENGER_DUMP_CRASH_WATCH_TO_STDERR", false);
 	config->beep = getEnvBool("PASSENGER_BEEP_ON_ABORT");
 	config->stopProcess = getEnvBool("PASSENGER_STOP_ON_ABORT");
 	config->forceTerminateProcess = getEnvBool("PASSENGER_FORCE_TERMINATE_ON_ABORT");

data/src/agent/Watchdog/Config.h

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

data/src/apache2_module/ConfigGeneral/AutoGeneratedDefinitions.cpp

@@ -67,6 +67,11 @@ extern "C" const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"Use specified HTTP/SOCKS proxy for Phusion Passenger(R) anonymous telemetry collection."),
+	AP_INIT_TAKE1("PassengerAppConnectTimeout",
+		(Take1Func) cmd_passenger_app_connect_timeout,
+		NULL,
+		RSRC_CONF | ACCESS_CONF,
+		"A timeout for application to accept socket connections."),
 	AP_INIT_TAKE1("PassengerAppEnv",
 		(Take1Func) cmd_passenger_app_env,
 		NULL,

data/src/apache2_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.cpp

@@ -159,6 +159,11 @@ void
 ConfigManifestGenerator::autoGenerated_setAppConfigDefaults() {
 	Json::Value &defaultAppConfigContainer = manifest["default_application_configuration"];
 
+	addOptionsContainerStaticDefaultInt(
+		defaultAppConfigContainer,
+		"PassengerAppConnectTimeout",
+		DEFAULT_CONNECT_TIMEOUT);
+
 	addOptionsContainerStaticDefaultStr(
 		defaultAppConfigContainer,
 		"PassengerAppEnv",

data/src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp

@@ -98,6 +98,20 @@ cmd_passenger_anonymous_telemetry_proxy(cmd_parms *cmd, void *pcfg, const char *
 	return NULL;
 }
 
+static const char *
+cmd_passenger_app_connect_timeout(cmd_parms *cmd, void *pcfg, const char *arg) {
+	const char *err = ap_check_cmd_context(cmd, NOT_IN_FILES);
+	if (err != NULL) {
+		return err;
+	}
+
+	DirConfig *config = (DirConfig *) pcfg;
+	config->mAppConnectTimeoutSourceFile = cmd->directive->filename;
+	config->mAppConnectTimeoutSourceLine = cmd->directive->line_num;
+	config->mAppConnectTimeoutExplicitlySet = true;
+	return setIntConfig(cmd, arg, config->mAppConnectTimeout, 1);
+}
+
 static const char *
 cmd_passenger_app_env(cmd_parms *cmd, void *pcfg, const char *arg) {
 	const char *err = ap_check_cmd_context(cmd, NOT_IN_FILES);

data/src/apache2_module/DirConfig/AutoGeneratedCreateFunction.cpp

@@ -52,6 +52,7 @@ namespace Apache2Module {
 static void
 createDirConfig_autoGenerated(DirConfig *config) {
 	config->mAllowEncodedSlashes = Apache2Module::UNSET;
+	config->mAppConnectTimeout = UNSET_INT_VALUE;
 	/*
 	 * config->mAppEnv: default initialized
 	 */
@@ -133,6 +134,7 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	 */
 
 	config->mAllowEncodedSlashesSourceLine = 0;
+	config->mAppConnectTimeoutSourceLine = 0;
 	config->mAppEnvSourceLine = 0;
 	config->mAppGroupNameSourceLine = 0;
 	config->mAppLogFileSourceLine = 0;
@@ -172,6 +174,7 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	config->mUserSourceLine = 0;
 
 	config->mAllowEncodedSlashesExplicitlySet = false;
+	config->mAppConnectTimeoutExplicitlySet = false;
 	config->mAppEnvExplicitlySet = false;
 	config->mAppGroupNameExplicitlySet = false;
 	config->mAppLogFileExplicitlySet = false;

data/src/apache2_module/DirConfig/AutoGeneratedHeaderSerialization.cpp

@@ -52,6 +52,9 @@ namespace Apache2Module {
 
 static void
 constructRequestHeaders_autoGenerated(request_rec *r, DirConfig *config, std::string &result) {
+	addHeader(r, result, StaticString("!~PASSENGER_APP_CONNECT_TIMEOUT",
+			sizeof("!~PASSENGER_APP_CONNECT_TIMEOUT") - 1),
+		config->mAppConnectTimeout);
 	addHeader(result, StaticString("!~PASSENGER_APP_ENV",
 			sizeof("!~PASSENGER_APP_ENV") - 1),
 		config->mAppEnv);

data/src/apache2_module/DirConfig/AutoGeneratedManifestGeneration.cpp

@@ -64,6 +64,17 @@ ConfigManifestGenerator::autoGenerated_generateConfigManifestForDirConfig(server
 			pdconf->mAllowEncodedSlashesSourceLine);
 		hierarchyMember["value"] = pdconf->mAllowEncodedSlashes == Apache2Module::ENABLED;
 	}
+	if (pdconf->mAppConnectTimeoutExplicitlySet) {
+		findOrCreateAppAndLocOptionsContainers(serverRec, csconf, cdconf,
+			pdconf, context, &appOptionsContainer, &locOptionsContainer);
+		Json::Value &optionContainer = findOrCreateOptionContainer(*appOptionsContainer,
+			"PassengerAppConnectTimeout",
+			sizeof("PassengerAppConnectTimeout") - 1);
+		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
+			pdconf->mAppConnectTimeoutSourceFile,
+			pdconf->mAppConnectTimeoutSourceLine);
+		hierarchyMember["value"] = pdconf->mAppConnectTimeout;
+	}
 	if (pdconf->mAppEnvExplicitlySet) {
 		findOrCreateAppAndLocOptionsContainers(serverRec, csconf, cdconf,
 			pdconf, context, &appOptionsContainer, &locOptionsContainer);

data/src/apache2_module/DirConfig/AutoGeneratedMergeFunction.cpp

@@ -52,6 +52,10 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 		(add->mAllowEncodedSlashes != Apache2Module::UNSET)
 		? add->mAllowEncodedSlashes
 		: base->mAllowEncodedSlashes;
+	config->mAppConnectTimeout =
+		(add->mAppConnectTimeout != UNSET_INT_VALUE)
+		? add->mAppConnectTimeout
+		: base->mAppConnectTimeout;
 	config->mAppEnv =
 		(!add->mAppEnv.empty())
 		? add->mAppEnv
@@ -202,6 +206,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 		: base->mUser;
 
 	config->mAllowEncodedSlashesSourceFile = add->mAllowEncodedSlashesSourceFile;
+	config->mAppConnectTimeoutSourceFile = add->mAppConnectTimeoutSourceFile;
 	config->mAppEnvSourceFile = add->mAppEnvSourceFile;
 	config->mAppGroupNameSourceFile = add->mAppGroupNameSourceFile;
 	config->mAppLogFileSourceFile = add->mAppLogFileSourceFile;
@@ -241,6 +246,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mUserSourceFile = add->mUserSourceFile;
 
 	config->mAllowEncodedSlashesSourceLine = add->mAllowEncodedSlashesSourceLine;
+	config->mAppConnectTimeoutSourceLine = add->mAppConnectTimeoutSourceLine;
 	config->mAppEnvSourceLine = add->mAppEnvSourceLine;
 	config->mAppGroupNameSourceLine = add->mAppGroupNameSourceLine;
 	config->mAppLogFileSourceLine = add->mAppLogFileSourceLine;
@@ -280,6 +286,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mUserSourceLine = add->mUserSourceLine;
 
 	config->mAllowEncodedSlashesExplicitlySet = add->mAllowEncodedSlashesExplicitlySet;
+	config->mAppConnectTimeoutExplicitlySet = add->mAppConnectTimeoutExplicitlySet;
 	config->mAppEnvExplicitlySet = add->mAppEnvExplicitlySet;
 	config->mAppGroupNameExplicitlySet = add->mAppGroupNameExplicitlySet;
 	config->mAppLogFileExplicitlySet = add->mAppLogFileExplicitlySet;

data/src/apache2_module/DirConfig/AutoGeneratedStruct.h

@@ -109,6 +109,11 @@ struct AutoGeneratedDirConfig {
 	 */
 	Threeway mStickySessions;
 
+	/*
+	 * A timeout for application to accept socket connections.
+	 */
+	int mAppConnectTimeout;
+
 	/*
 	 * Force Passenger to believe that an application process can handle the given number of concurrent requests per process
 	 */
@@ -260,6 +265,7 @@ struct AutoGeneratedDirConfig {
 	StaticString mLoadShellEnvvarsSourceFile;
 	StaticString mPreloadBundlerSourceFile;
 	StaticString mStickySessionsSourceFile;
+	StaticString mAppConnectTimeoutSourceFile;
 	StaticString mForceMaxConcurrentRequestsPerProcessSourceFile;
 	StaticString mLveMinUidSourceFile;
 	StaticString mMaxPreloaderIdleTimeSourceFile;
@@ -299,6 +305,7 @@ struct AutoGeneratedDirConfig {
 	unsigned int mLoadShellEnvvarsSourceLine;
 	unsigned int mPreloadBundlerSourceLine;
 	unsigned int mStickySessionsSourceLine;
+	unsigned int mAppConnectTimeoutSourceLine;
 	unsigned int mForceMaxConcurrentRequestsPerProcessSourceLine;
 	unsigned int mLveMinUidSourceLine;
 	unsigned int mMaxPreloaderIdleTimeSourceLine;
@@ -338,6 +345,7 @@ struct AutoGeneratedDirConfig {
 	bool mLoadShellEnvvarsExplicitlySet: 1;
 	bool mPreloadBundlerExplicitlySet: 1;
 	bool mStickySessionsExplicitlySet: 1;
+	bool mAppConnectTimeoutExplicitlySet: 1;
 	bool mForceMaxConcurrentRequestsPerProcessExplicitlySet: 1;
 	bool mLveMinUidExplicitlySet: 1;
 	bool mMaxPreloaderIdleTimeExplicitlySet: 1;
@@ -454,6 +462,15 @@ struct AutoGeneratedDirConfig {
 		}
 	}
 
+	int
+	getAppConnectTimeout() const {
+		if (mAppConnectTimeout == UNSET_INT_VALUE) {
+			return DEFAULT_CONNECT_TIMEOUT;
+		} else {
+			return mAppConnectTimeout;
+		}
+	}
+
 	int
 	getForceMaxConcurrentRequestsPerProcess() const {
 		if (mForceMaxConcurrentRequestsPerProcess == UNSET_INT_VALUE) {

data/src/apache2_module/Hooks.cpp

@@ -416,12 +416,6 @@ private:
 		return s1.st_dev == s2.st_dev && s1.st_ino == s2.st_ino && s1.st_rdev == s2.st_rdev;
 	}
 
-	int reportBusyException(request_rec *r) {
-		ap_custom_response(r, HTTP_SERVICE_UNAVAILABLE,
-			"This website is too busy right now.  Please try again later.");
-		return HTTP_SERVICE_UNAVAILABLE;
-	}
-
 	/**
 	 * Gather some information about the request and do some preparations.
 	 *

data/src/cxx_supportlib/ConfigKit/IN_PRACTICE.md

@@ -333,12 +333,7 @@ DnsQuerier also logs its progress to a log file. This log file is opened during
 This example demonstrates caching of configuration values, and it demonstrates how to perform arbitrary operations necessary for applying a configuration change (in this case, opening a new log file and closing the previous one).
 
 ~~~c++
-// for std::swap()
- #if __cplusplus >= 201103L
-     #include <utility>
- #else
-     #include <algorithm>
- #endif
+ #include <utility>
  #include <cstdio>
  #include <cstddef>
  #include <string>
@@ -495,12 +490,7 @@ However, a subclass may not rename the parent's config options, or remove any of
 The following example demonstrates HappyDnsQuerier: a DnsQuerier subclass that prints a configurable message whenever `query()` is called.
 
 ~~~c++
- // for std::swap()
- #if __cplusplus >= 201103L
-     #include <utility>
- #else
-     #include <algorithm>
- #endif
+ #include <utility>
  #include <iostream>
  #include <boost/config.hpp>
  #include <boost/scoped_ptr.hpp>

data/src/cxx_supportlib/ConfigKit/Store.h

@@ -29,12 +29,7 @@
 #include <string>
 #include <vector>
 #include <cassert>
-// for std::swap()
-#if __cplusplus >= 201103L
-	#include <utility>
-#else
-	#include <algorithm>
-#endif
+#include <utility>
 #include <boost/config.hpp>
 
 #include <jsoncpp/json.h>

data/src/cxx_supportlib/Constants.h

@@ -84,7 +84,7 @@
 #define PASSENGER_API_VERSION_MAJOR 0
 #define PASSENGER_API_VERSION_MINOR 3
 #define PASSENGER_DEFAULT_USER "nobody"
-#define PASSENGER_VERSION "6.0.27"
+#define PASSENGER_VERSION "6.1.0"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"

data/src/cxx_supportlib/DataStructures/StringKeyTable.h

@@ -29,13 +29,7 @@
 #include <boost/move/move.hpp>
 #include <boost/config.hpp>
 #include <boost/cstdint.hpp>
-// for std::swap()
-#if __cplusplus >= 201103L
-	#include <utility>
-#else
-	#include <algorithm>
-#endif
-#include <limits>
+#include <utility>
 #include <cstring>
 #include <cassert>
 #include <cstddef>