passenger 6.0.27 → 6.1.1

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.1"
 #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>

data/src/cxx_supportlib/Exceptions.cpp

@@ -27,6 +27,9 @@
 #include <Exceptions.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sstream>
+#include <cstring>
+#include <cassert>
 
 
 void
@@ -70,3 +73,178 @@ pp_error_set(const std::exception &ex, PP_Error *error) {
 		error->errnoCode = PP_NO_ERRNO;
 	}
 }
+
+
+namespace Passenger {
+
+SystemException::SystemException(const string &briefMessage, int errorCode) {
+	stringstream str;
+	str << strerror(errorCode) << " (errno=" << errorCode << ")";
+	systemMessage = str.str();
+	setBriefMessage(briefMessage);
+	m_code = errorCode;
+}
+
+SystemException::~SystemException() noexcept {}
+
+const char *
+SystemException::what() const noexcept {
+	return fullMessage.c_str();
+}
+
+void
+SystemException::setBriefMessage(const string &message) {
+	briefMessage = message;
+	fullMessage = briefMessage + ": " + systemMessage;
+}
+
+int
+SystemException::code() const noexcept {
+	return m_code;
+}
+
+string
+SystemException::brief() const noexcept {
+	return briefMessage;
+}
+
+string
+SystemException::sys() const noexcept {
+	return systemMessage;
+}
+
+
+FileSystemException::FileSystemException(const string &message, int errorCode, const string &filename)
+	: SystemException(message, errorCode), m_filename(filename) {}
+
+FileSystemException::~FileSystemException() noexcept {}
+
+string
+FileSystemException::filename() const noexcept {
+	return m_filename;
+}
+
+
+TimeRetrievalException::TimeRetrievalException(const string &message, int errorCode)
+	: SystemException(message, errorCode) {}
+
+TimeRetrievalException::~TimeRetrievalException() noexcept {}
+
+
+IOException::IOException(const string &message) : msg(message) {}
+
+IOException::~IOException() noexcept {}
+
+const char *
+IOException::what() const noexcept {
+	return msg.c_str();
+}
+
+
+FileNotFoundException::FileNotFoundException(const string &message) : IOException(message) {}
+
+FileNotFoundException::~FileNotFoundException() noexcept {}
+
+
+EOFException::EOFException(const string &message) : IOException(message) {}
+
+EOFException::~EOFException() noexcept {}
+
+
+ConfigurationException::ConfigurationException(const string &message) : msg(message) {}
+
+ConfigurationException::~ConfigurationException() noexcept {}
+
+const char *
+ConfigurationException::what() const noexcept {
+	return msg.c_str();
+}
+
+
+GetAbortedException::GetAbortedException(const string &message) : msg(message) {}
+
+GetAbortedException::GetAbortedException(const oxt::tracable_exception::no_backtrace &tag)
+	: oxt::tracable_exception(tag) {}
+
+GetAbortedException::~GetAbortedException() noexcept {}
+
+const char *
+GetAbortedException::what() const noexcept {
+	return msg.c_str();
+}
+
+
+RequestQueueFullException::RequestQueueFullException(unsigned int maxQueueSize)
+	: GetAbortedException(oxt::tracable_exception::no_backtrace())
+{
+	stringstream str;
+	str << "Request queue full (configured max. size: " << maxQueueSize << ")";
+	msg = str.str();
+}
+
+RequestQueueFullException::~RequestQueueFullException() noexcept {}
+
+const char *
+RequestQueueFullException::what() const noexcept {
+	return msg.c_str();
+}
+
+
+ArgumentException::ArgumentException(const string &message) : msg(message) {}
+
+ArgumentException::~ArgumentException() noexcept {}
+
+const char *
+ArgumentException::what() const noexcept {
+	return msg.c_str();
+}
+
+
+InvalidModeStringException::InvalidModeStringException(const string &message) : ArgumentException(message) {}
+
+
+RuntimeException::RuntimeException(const string &message) : msg(message) {}
+
+RuntimeException::~RuntimeException() noexcept {}
+
+const char *
+RuntimeException::what() const noexcept {
+	return msg.c_str();
+}
+
+
+TimeoutException::TimeoutException(const string &message) : msg(message) {}
+
+TimeoutException::~TimeoutException() noexcept {}
+
+const char *
+TimeoutException::what() const noexcept {
+	return msg.c_str();
+}
+
+
+SecurityException::SecurityException(const string &message) : msg(message) {}
+
+SecurityException::~SecurityException() noexcept {}
+
+const char *
+SecurityException::what() const noexcept {
+	return msg.c_str();
+}
+
+
+NonExistentUserException::NonExistentUserException(const string &message) : SecurityException(message) {}
+
+NonExistentGroupException::NonExistentGroupException(const string &message) : SecurityException(message) {}
+
+
+SyntaxError::SyntaxError(const string &message) : msg(message) {}
+
+SyntaxError::~SyntaxError() noexcept {}
+
+const char *
+SyntaxError::what() const noexcept {
+	return msg.c_str();
+}
+
+} // namespace Passenger