passenger 6.0.26 → 6.1.0

data/src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp

@@ -56,66 +56,6 @@ namespace Apache2Module {
  *   rake src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp
  */
 
-static const char *
-cmd_passenger_admin_panel_auth_type(cmd_parms *cmd, void *pcfg, const char *arg) {
-	const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
-	if (err != NULL) {
-		ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->temp_pool,
-			"WARNING: %s", err);
-	}
-
-	serverConfig.adminPanelAuthTypeSourceFile = cmd->directive->filename;
-	serverConfig.adminPanelAuthTypeSourceLine = cmd->directive->line_num;
-	serverConfig.adminPanelAuthTypeExplicitlySet = true;
-	serverConfig.adminPanelAuthType = arg;
-	return NULL;
-}
-
-static const char *
-cmd_passenger_admin_panel_password(cmd_parms *cmd, void *pcfg, const char *arg) {
-	const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
-	if (err != NULL) {
-		ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->temp_pool,
-			"WARNING: %s", err);
-	}
-
-	serverConfig.adminPanelPasswordSourceFile = cmd->directive->filename;
-	serverConfig.adminPanelPasswordSourceLine = cmd->directive->line_num;
-	serverConfig.adminPanelPasswordExplicitlySet = true;
-	serverConfig.adminPanelPassword = arg;
-	return NULL;
-}
-
-static const char *
-cmd_passenger_admin_panel_url(cmd_parms *cmd, void *pcfg, const char *arg) {
-	const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
-	if (err != NULL) {
-		ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->temp_pool,
-			"WARNING: %s", err);
-	}
-
-	serverConfig.adminPanelUrlSourceFile = cmd->directive->filename;
-	serverConfig.adminPanelUrlSourceLine = cmd->directive->line_num;
-	serverConfig.adminPanelUrlExplicitlySet = true;
-	serverConfig.adminPanelUrl = arg;
-	return NULL;
-}
-
-static const char *
-cmd_passenger_admin_panel_username(cmd_parms *cmd, void *pcfg, const char *arg) {
-	const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
-	if (err != NULL) {
-		ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->temp_pool,
-			"WARNING: %s", err);
-	}
-
-	serverConfig.adminPanelUsernameSourceFile = cmd->directive->filename;
-	serverConfig.adminPanelUsernameSourceLine = cmd->directive->line_num;
-	serverConfig.adminPanelUsernameExplicitlySet = true;
-	serverConfig.adminPanelUsername = arg;
-	return NULL;
-}
-
 static const char *
 cmd_passenger_allow_encoded_slashes(cmd_parms *cmd, void *pcfg, const char *arg) {
 	DirConfig *config = (DirConfig *) pcfg;
@@ -158,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.
 	 *
@@ -1382,10 +1376,6 @@ public:
 		config["turbocaching"] = serverConfig.turbocaching;
 		config["old_routing"] = serverConfig.oldRouting;
 		config["prestart_urls"] = strsetToJson(serverConfig.prestartURLs);
-		config["admin_panel_url"] = nonEmptyString(serverConfig.adminPanelUrl);
-		config["admin_panel_auth_type"] = nonEmptyString(serverConfig.adminPanelAuthType);
-		config["admin_panel_username"] = nonEmptyString(serverConfig.adminPanelUsername);
-		config["admin_panel_password"] = nonEmptyString(serverConfig.adminPanelPassword);
 		config["disable_log_prefix"] = serverConfig.disableLogPrefix;
 
 		if (!serverConfig.logFile.empty()) {

data/src/apache2_module/ServerConfig/AutoGeneratedManifestGeneration.cpp

@@ -47,50 +47,6 @@ void
 ConfigManifestGenerator::autoGenerated_generateConfigManifestForServerConfig() {
 	Json::Value &globalOptionsContainer = manifest["global_configuration"];
 
-	if (serverConfig.adminPanelAuthTypeExplicitlySet) {
-		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
-			"PassengerAdminPanelAuthType",
-			sizeof("PassengerAdminPanelAuthType") - 1);
-		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
-			serverConfig.adminPanelAuthTypeSourceFile,
-			serverConfig.adminPanelAuthTypeSourceLine);
-		hierarchyMember["value"] = Json::Value(
-			serverConfig.adminPanelAuthType.data(),
-			serverConfig.adminPanelAuthType.data() + serverConfig.adminPanelAuthType.size());
-	}
-	if (serverConfig.adminPanelPasswordExplicitlySet) {
-		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
-			"PassengerAdminPanelPassword",
-			sizeof("PassengerAdminPanelPassword") - 1);
-		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
-			serverConfig.adminPanelPasswordSourceFile,
-			serverConfig.adminPanelPasswordSourceLine);
-		hierarchyMember["value"] = Json::Value(
-			serverConfig.adminPanelPassword.data(),
-			serverConfig.adminPanelPassword.data() + serverConfig.adminPanelPassword.size());
-	}
-	if (serverConfig.adminPanelUrlExplicitlySet) {
-		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
-			"PassengerAdminPanelUrl",
-			sizeof("PassengerAdminPanelUrl") - 1);
-		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
-			serverConfig.adminPanelUrlSourceFile,
-			serverConfig.adminPanelUrlSourceLine);
-		hierarchyMember["value"] = Json::Value(
-			serverConfig.adminPanelUrl.data(),
-			serverConfig.adminPanelUrl.data() + serverConfig.adminPanelUrl.size());
-	}
-	if (serverConfig.adminPanelUsernameExplicitlySet) {
-		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
-			"PassengerAdminPanelUsername",
-			sizeof("PassengerAdminPanelUsername") - 1);
-		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
-			serverConfig.adminPanelUsernameSourceFile,
-			serverConfig.adminPanelUsernameSourceLine);
-		hierarchyMember["value"] = Json::Value(
-			serverConfig.adminPanelUsername.data(),
-			serverConfig.adminPanelUsername.data() + serverConfig.adminPanelUsername.size());
-	}
 	if (serverConfig.anonymousTelemetryProxyExplicitlySet) {
 		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
 			"PassengerAnonymousTelemetryProxy",

data/src/apache2_module/ServerConfig/AutoGeneratedStruct.h

@@ -128,26 +128,6 @@ struct AutoGeneratedServerConfig {
 	 */
 	int statThrottleRate;
 
-	/*
-	 * The authentication type to use when connecting to the admin panel
-	 */
-	StaticString adminPanelAuthType;
-
-	/*
-	 * The password to use when connecting to the admin panel using basic authentication
-	 */
-	StaticString adminPanelPassword;
-
-	/*
-	 * Connect to an admin panel at the given connector URL
-	 */
-	StaticString adminPanelUrl;
-
-	/*
-	 * The username to use when connecting to the admin panel using basic authentication
-	 */
-	StaticString adminPanelUsername;
-
 	/*
 	 * Use specified HTTP/SOCKS proxy for Phusion Passenger(R) anonymous telemetry collection.
 	 */
@@ -228,10 +208,6 @@ struct AutoGeneratedServerConfig {
 	StaticString responseBufferHighWatermarkSourceFile;
 	StaticString socketBacklogSourceFile;
 	StaticString statThrottleRateSourceFile;
-	StaticString adminPanelAuthTypeSourceFile;
-	StaticString adminPanelPasswordSourceFile;
-	StaticString adminPanelUrlSourceFile;
-	StaticString adminPanelUsernameSourceFile;
 	StaticString anonymousTelemetryProxySourceFile;
 	StaticString dataBufferDirSourceFile;
 	StaticString defaultGroupSourceFile;
@@ -260,10 +236,6 @@ struct AutoGeneratedServerConfig {
 	unsigned int responseBufferHighWatermarkSourceLine;
 	unsigned int socketBacklogSourceLine;
 	unsigned int statThrottleRateSourceLine;
-	unsigned int adminPanelAuthTypeSourceLine;
-	unsigned int adminPanelPasswordSourceLine;
-	unsigned int adminPanelUrlSourceLine;
-	unsigned int adminPanelUsernameSourceLine;
 	unsigned int anonymousTelemetryProxySourceLine;
 	unsigned int dataBufferDirSourceLine;
 	unsigned int defaultGroupSourceLine;
@@ -292,10 +264,6 @@ struct AutoGeneratedServerConfig {
 	bool responseBufferHighWatermarkExplicitlySet: 1;
 	bool socketBacklogExplicitlySet: 1;
 	bool statThrottleRateExplicitlySet: 1;
-	bool adminPanelAuthTypeExplicitlySet: 1;
-	bool adminPanelPasswordExplicitlySet: 1;
-	bool adminPanelUrlExplicitlySet: 1;
-	bool adminPanelUsernameExplicitlySet: 1;
 	bool anonymousTelemetryProxyExplicitlySet: 1;
 	bool dataBufferDirExplicitlySet: 1;
 	bool defaultGroupExplicitlySet: 1;
@@ -326,18 +294,6 @@ struct AutoGeneratedServerConfig {
 		responseBufferHighWatermark = DEFAULT_RESPONSE_BUFFER_HIGH_WATERMARK;
 		socketBacklog = DEFAULT_SOCKET_BACKLOG;
 		statThrottleRate = DEFAULT_STAT_THROTTLE_RATE;
-		/*
-		 * adminPanelAuthType: default initialized
-		 */
-		/*
-		 * adminPanelPassword: default initialized
-		 */
-		/*
-		 * adminPanelUrl: default initialized
-		 */
-		/*
-		 * adminPanelUsername: default initialized
-		 */
 		/*
 		 * anonymousTelemetryProxy: default initialized
 		 */
@@ -388,10 +344,6 @@ struct AutoGeneratedServerConfig {
 		responseBufferHighWatermarkSourceLine = 0;
 		socketBacklogSourceLine = 0;
 		statThrottleRateSourceLine = 0;
-		adminPanelAuthTypeSourceLine = 0;
-		adminPanelPasswordSourceLine = 0;
-		adminPanelUrlSourceLine = 0;
-		adminPanelUsernameSourceLine = 0;
 		anonymousTelemetryProxySourceLine = 0;
 		dataBufferDirSourceLine = 0;
 		defaultGroupSourceLine = 0;
@@ -420,10 +372,6 @@ struct AutoGeneratedServerConfig {
 		responseBufferHighWatermarkExplicitlySet = false;
 		socketBacklogExplicitlySet = false;
 		statThrottleRateExplicitlySet = false;
-		adminPanelAuthTypeExplicitlySet = false;
-		adminPanelPasswordExplicitlySet = false;
-		adminPanelUrlExplicitlySet = false;
-		adminPanelUsernameExplicitlySet = false;
 		anonymousTelemetryProxyExplicitlySet = false;
 		dataBufferDirExplicitlySet = false;
 		defaultGroupExplicitlySet = false;

data/src/cxx_supportlib/Algorithms/Hasher.cpp

@@ -42,7 +42,7 @@ JenkinsHash::update(const char *data, unsigned int size) {
 	}
 }
 
-boost::uint32_t
+std::uint32_t
 JenkinsHash::finalize() {
 	hash += (hash << 3);
 	hash ^= (hash >> 11);

data/src/cxx_supportlib/Algorithms/Hasher.h

@@ -26,25 +26,22 @@
 #ifndef _PASSENGER_ALGORITHMS_HASHER_H_
 #define _PASSENGER_ALGORITHMS_HASHER_H_
 
-#include <boost/cstdint.hpp>
+#include <cstdint>
 
 namespace Passenger {
 
 
-// TODO: use SpookyHash on x86_64
-// TODO: use streaming murmurhash implementation: https://github.com/c9/murmur3
-
 struct JenkinsHash {
-	static const boost::uint32_t EMPTY_STRING_HASH = 0;
+	static const std::uint32_t EMPTY_STRING_HASH = 0;
 
-	boost::uint32_t hash;
+	std::uint32_t hash;
 
 	JenkinsHash()
 		: hash(0)
 		{ }
 
 	void update(const char *data, unsigned int size);
-	boost::uint32_t finalize();
+	std::uint32_t finalize();
 
 	void reset() {
 		hash = 0;

data/src/cxx_supportlib/Algorithms/MovingAverage.h

@@ -27,168 +27,9 @@
 #define _PASSENGER_ALGORITHMS_EXP_MOVING_AVERAGE_H_
 
 #include <oxt/macros.hpp>
-#include <boost/config.hpp>
-#include <algorithm>
-#include <utility>
-#include <cmath>
 
 namespace Passenger {
 
-using namespace std;
-
-
-/**
- * Implements discontiguous exponential moving averaging, as described by John C. Gunther
- * 1998. Can be used to compute moving exponentially decaying averages and standard
- * deviations. Unlike normal exponential moving average, this algorithm also works when
- * the data has gaps, and it also avoids initial value bias and postgap bias. See
- * http://www.drdobbs.com/tools/discontiguous-exponential-averaging/184410671
- *
- * ## Template parameters
- *
- * ### alpha
- *
- * Specifies by what factor data should decay. Its range is [0, 1000]. Higher values
- * cause the current value to have more weight (and thus the previous average
- * to decay more quickly), lower values have the opposite effect.
- *
- * ### alphaTimeUnit
- *
- * Specifies the time, in microseconds, after which the data should decay
- * by a factor of exactly `alpha`. For example, if `alpha = 0.5` and `alphaTimeUnit = 2000000`,
- * then data decays by 0.5 per 2 seconds.
- *
- * The default value is 1 second.
- *
- * ### maxAge
- *
- * Represents an educational guess as to how long (in microseconds) it takes
- * for the sampled data sequence to change significantly. If you don't expect large random
- * variations then you should set this to a large value. For a data sequence dominated by
- * large random variations, setting this to 1000000 (1 second) might be appropriate.
- *
- * If the time interval between updates is `dt`, using a `maxAge` of `N * dt` will cause
- * each update to fill in up to `N - 1` of any preceeding skipped updates with the current
- * data value.
- */
-template<
-	unsigned int alpha,
-	unsigned long long alphaTimeUnit = 1000000,
-	unsigned long long maxAge = 1000000
->
-class DiscExpMovingAverage {
-private:
-	template<unsigned int, unsigned long long, unsigned long long>
-	friend class DiscExpMovingAverageWithStddev;
-
-	double sumOfWeights, sumOfData;
-	unsigned long long prevTime;
-
-	static BOOST_CONSTEXPR double floatingAlpha() {
-		return alpha / 1000.0;
-	}
-
-	static BOOST_CONSTEXPR double newDataWeightUpperBound() {
-		return pow(floatingAlpha(), maxAge / (double) alphaTimeUnit);
-	}
-
-	pair<double, double> internalUpdate(double value, unsigned long long now) {
-		double weightReductionFactor = pow(1 - floatingAlpha(),
-			(now - prevTime) / (double) alphaTimeUnit);
-		double newDataWeight = std::min(1 - weightReductionFactor,
-			newDataWeightUpperBound());
-		sumOfWeights = weightReductionFactor * sumOfWeights + newDataWeight;
-		sumOfData = weightReductionFactor * sumOfData + newDataWeight * value;
-		prevTime = now;
-		return make_pair(weightReductionFactor, newDataWeight);
-	}
-
-public:
-	DiscExpMovingAverage(unsigned long long _prevTime = 0)
-		: sumOfWeights(0),
-		  sumOfData(0),
-		  prevTime(_prevTime)
-		{ }
-
-	void update(double value, unsigned long long now) {
-		if (OXT_LIKELY(now > prevTime)) {
-			internalUpdate(value, now);
-		}
-	}
-
-	bool available() const {
-		return sumOfWeights > 0;
-	}
-
-	double completeness(unsigned long long now) const {
-		return pow(floatingAlpha(), now - prevTime) * sumOfWeights;
-	}
-
-	double average() const {
-		return sumOfData / sumOfWeights;
-	}
-
-	double average(unsigned long long now) const {
-		DiscExpMovingAverage<alpha, alphaTimeUnit, maxAge> copy(*this);
-		copy.update(0, now);
-		return copy.average();
-	}
-};
-
-
-/**
- * Like DescExpMovingAverage, but also keeps track of the standard deviation.
- */
-template<
-	unsigned int alpha,
-	unsigned long long alphaTimeUnit = 1000000,
-	unsigned long long maxAge = 1
->
-class DiscExpMovingAverageWithStddev {
-private:
-	DiscExpMovingAverage<alpha, alphaTimeUnit, maxAge> dema;
-	double sumOfSquaredData;
-
-public:
-	DiscExpMovingAverageWithStddev(unsigned long long prevTime = 0)
-		: dema(prevTime),
-		  sumOfSquaredData(0)
-		{ }
-
-	void update(double value, unsigned long long now) {
-		if (OXT_UNLIKELY(now <= dema.prevTime)) {
-			return;
-		}
-
-		pair<double, double> p = dema.internalUpdate(value, now);
-		double weightReductionFactor = p.first;
-		double newDataWeight = p.second;
-		sumOfSquaredData = weightReductionFactor * sumOfSquaredData
-			+ newDataWeight * pow(value, 2.0);
-	}
-
-	bool available() const {
-		return dema.available();
-	}
-
-	double completeness(unsigned long long now) const {
-		return dema.completeness(now);
-	}
-
-	double average() const {
-		return dema.average();
-	}
-
-	double average(unsigned long long now) const {
-		return dema.average(now);
-	}
-
-	double stddev() const {
-		return sqrt(sumOfSquaredData / dema.sumOfWeights - pow(average(), 2));
-	}
-};
-
-
 /**
  * Calculates an exponential moving average. `alpha` determines how much weight the
  * current value has compared to the previous average. Higher values of `alpha`
@@ -197,7 +38,7 @@ public:
  *
  * This algorithm is not timing sensitive: it doesn't take into account gaps in the
  * data over time, and treats all values equally regardless of when the value was
- * collected. See also DiscExpMovingAverage.
+ * collected.
  *
  * You should initialize the the average value with a value equal to `nullValue`.
  * If `prevAverage` equals `nullValue` then this function simply returns `currentValue`.

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

@@ -50,6 +50,7 @@
 #define DEFAULT_APP_THREAD_COUNT 1
 #define DEFAULT_BIND_ADDRESS "127.0.0.1"
 #define DEFAULT_CONCURRENCY_MODEL "process"
+#define DEFAULT_CONNECT_TIMEOUT 30
 #define DEFAULT_FILE_BUFFERED_CHANNEL_THRESHOLD 131072
 #define DEFAULT_HTTP_SERVER_LISTEN_ADDRESS "tcp://127.0.0.1:3000"
 #define DEFAULT_INTEGRATION_MODE "standalone"
@@ -83,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.26"
+#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"