passenger 6.0.2 → 6.0.3

data/src/agent/Watchdog/WatchdogMain.cpp

@@ -654,6 +654,9 @@ usage() {
 	printf("      --instance-registry-dir  Directory to register instance into.\n");
 	printf("                               Default: %s\n", getSystemTempDir());
 	printf("\n");
+	printf("      --spawn-dir              Directory for spawn handshakes.\n");
+	printf("                               Default: %s\n", getSystemTempDir());
+	printf("\n");
 	printf("      --no-user-switching     Disables user switching support [A]\n");
 	printf("      --default-user NAME     Default user to start apps as, when user\n");
 	printf("                              switching is enabled. Default: " DEFAULT_WEB_APP_USER "\n");
@@ -774,6 +777,9 @@ parseOptions(int argc, const char *argv[], ConfigKit::Store &config) {
 		} else if (p.isValueFlag(argc, i, argv[i], '\0', "--instance-registry-dir")) {
 			updates["instance_registry_dir"] = argv[i + 1];
 			i += 2;
+		} else if (p.isValueFlag(argc, i, argv[i], '\0', "--spawn-dir")) {
+			updates["spawn_dir"] = argv[i + 1];
+			i += 2;
 		} else if (p.isFlag(argv[i], '\0', "--no-user-switching")) {
 			updates["user_switching"] = false;
 			i++;
@@ -1111,6 +1117,7 @@ initializeWorkingObjects(const WorkingObjectsPtr &wo, InstanceDirToucherPtr &ins
 
 	// check if path is safe
 	warnIfInstanceDirVulnerable(watchdogConfig->get("instance_registry_dir").asString());
+	warnIfInstanceDirVulnerable(watchdogConfig->get("spawn_dir").asString());
 
 	wo->instanceDir = boost::make_shared<InstanceDirectory>(instanceOptions,
 		watchdogConfig->get("instance_registry_dir").asString());

data/src/apache2_module/ConfigGeneral/AutoGeneratedDefinitions.cpp

@@ -382,6 +382,11 @@ extern "C" const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"The Phusion Passenger socket backlog."),
+	AP_INIT_TAKE1("PassengerSpawnDir",
+		(Take1Func) cmd_passenger_spawn_dir,
+		NULL,
+		RSRC_CONF,
+		"The directory for Phusion Passenger used during child spawning."),
 	AP_INIT_TAKE1("PassengerSpawnMethod",
 		(Take1Func) cmd_passenger_spawn_method,
 		NULL,

data/src/apache2_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.cpp

@@ -128,6 +128,11 @@ ConfigManifestGenerator::autoGenerated_setGlobalConfigDefaults() {
 		"PassengerSocketBacklog",
 		DEFAULT_SOCKET_BACKLOG);
 
+	addOptionsContainerDynamicDefault(
+		globalConfigContainer,
+		"PassengerSpawnDir",
+		P_STATIC_STRING("Either $TMPDIR or /tmp"));
+
 	addOptionsContainerStaticDefaultInt(
 		globalConfigContainer,
 		"PassengerStatThrottleRate",

data/src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp

@@ -832,6 +832,21 @@ cmd_passenger_socket_backlog(cmd_parms *cmd, void *pcfg, const char *arg) {
 	return setIntConfig(cmd, arg, serverConfig.socketBacklog, 0);
 }
 
+static const char *
+cmd_passenger_spawn_dir(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.spawnDirSourceFile = cmd->directive->filename;
+	serverConfig.spawnDirSourceLine = cmd->directive->line_num;
+	serverConfig.spawnDirExplicitlySet = true;
+	serverConfig.spawnDir = arg;
+	return NULL;
+}
+
 static const char *
 cmd_passenger_start_timeout(cmd_parms *cmd, void *pcfg, const char *arg) {
 	const char *err = ap_check_cmd_context(cmd, NOT_IN_FILES);

data/src/apache2_module/Hooks.cpp

@@ -1334,6 +1334,7 @@ public:
 		config["controller_socket_backlog"] = serverConfig.socketBacklog;
 		config["controller_file_buffered_channel_buffer_dir"] = nonEmptyString(serverConfig.dataBufferDir);
 		config["instance_registry_dir"] = nonEmptyString(serverConfig.instanceRegistryDir);
+		config["spawn_dir"] = nonEmptyString(serverConfig.spawnDir);
 		config["security_update_checker_disabled"] = serverConfig.disableSecurityUpdateCheck;
 		config["security_update_checker_proxy_url"] = nonEmptyString(serverConfig.securityUpdateCheckProxy);
 		config["telemetry_collector_disabled"] = serverConfig.disableAnonymousTelemetry;

data/src/apache2_module/ServerConfig/AutoGeneratedManifestGeneration.cpp

@@ -312,6 +312,17 @@ ConfigManifestGenerator::autoGenerated_generateConfigManifestForServerConfig() {
 			serverConfig.socketBacklogSourceLine);
 		hierarchyMember["value"] = serverConfig.socketBacklog;
 	}
+	if (serverConfig.spawnDirExplicitlySet) {
+		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
+			"PassengerSpawnDir",
+			sizeof("PassengerSpawnDir") - 1);
+		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
+			serverConfig.spawnDirSourceFile,
+			serverConfig.spawnDirSourceLine);
+		hierarchyMember["value"] = Json::Value(
+			serverConfig.spawnDir.data(),
+			serverConfig.spawnDir.data() + serverConfig.spawnDir.size());
+	}
 	if (serverConfig.statThrottleRateExplicitlySet) {
 		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
 			"PassengerStatThrottleRate",

data/src/apache2_module/ServerConfig/AutoGeneratedStruct.h

@@ -197,6 +197,11 @@ struct AutoGeneratedServerConfig {
 	 */
 	StaticString securityUpdateCheckProxy;
 
+	/*
+	 * The directory for Phusion Passenger used during child spawning.
+	 */
+	StaticString spawnDir;
+
 	/*
 	 * Prestart the given web applications during startup.
 	 */
@@ -231,6 +236,7 @@ struct AutoGeneratedServerConfig {
 	StaticString logFileSourceFile;
 	StaticString rootSourceFile;
 	StaticString securityUpdateCheckProxySourceFile;
+	StaticString spawnDirSourceFile;
 	StaticString prestartURLsSourceFile;
 
 	unsigned int disableAnonymousTelemetrySourceLine;
@@ -261,6 +267,7 @@ struct AutoGeneratedServerConfig {
 	unsigned int logFileSourceLine;
 	unsigned int rootSourceLine;
 	unsigned int securityUpdateCheckProxySourceLine;
+	unsigned int spawnDirSourceLine;
 	unsigned int prestartURLsSourceLine;
 
 	bool disableAnonymousTelemetryExplicitlySet: 1;
@@ -291,6 +298,7 @@ struct AutoGeneratedServerConfig {
 	bool logFileExplicitlySet: 1;
 	bool rootExplicitlySet: 1;
 	bool securityUpdateCheckProxyExplicitlySet: 1;
+	bool spawnDirExplicitlySet: 1;
 	bool prestartURLsExplicitlySet: 1;
 
 
@@ -349,6 +357,9 @@ struct AutoGeneratedServerConfig {
 		/*
 		 * securityUpdateCheckProxy: default initialized
 		 */
+		/*
+		 * spawnDir: default initialized
+		 */
 		/*
 		 * prestartURLs: default initialized
 		 */
@@ -381,6 +392,7 @@ struct AutoGeneratedServerConfig {
 		logFileSourceLine = 0;
 		rootSourceLine = 0;
 		securityUpdateCheckProxySourceLine = 0;
+		spawnDirSourceLine = 0;
 		prestartURLsSourceLine = 0;
 
 		disableAnonymousTelemetryExplicitlySet = false;
@@ -411,6 +423,7 @@ struct AutoGeneratedServerConfig {
 		logFileExplicitlySet = false;
 		rootExplicitlySet = false;
 		securityUpdateCheckProxyExplicitlySet = false;
+		spawnDirExplicitlySet = false;
 		prestartURLsExplicitlySet = false;
 	}
 

data/src/cxx_supportlib/Constants.h

@@ -81,7 +81,7 @@
 #define PASSENGER_API_VERSION_MAJOR 0
 #define PASSENGER_API_VERSION_MINOR 3
 #define PASSENGER_DEFAULT_USER "nobody"
-#define PASSENGER_VERSION "6.0.2"
+#define PASSENGER_VERSION "6.0.3"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"

data/src/cxx_supportlib/LoggingKit/Config.h

@@ -51,6 +51,7 @@ using namespace std;
  *
  *   app_output_log_level         string    -   default("notice")
  *   buffer_logs                  boolean   -   default(false)
+ *   disable_log_prefix           boolean   -   default(false)
  *   file_descriptor_log_target   any       -   -
  *   level                        string    -   default("notice")
  *   redirect_stderr              boolean   -   default(true)

data/src/cxx_supportlib/ServerKit/HttpChunkedBodyParser.h

@@ -112,7 +112,7 @@ private:
 	static int parseHexDigit(char ch) {
 		if (ch >= 'A' && ch <= 'F') {
 			return 10 + ch - 'A';
-		} else if (ch >= 'a' && ch <= 'z') {
+		} else if (ch >= 'a' && ch <= 'f') {
 			return 10 + ch - 'a';
 		} else {
 			return ch - '0';

data/src/cxx_supportlib/SystemTools/ContainerHelpers.h

@@ -43,7 +43,7 @@ _linuxAutoDetectInContainer() {
 		return (file.length() > 0);
 	}
 
-	if (getuid() == 0) {
+	if (geteuid() == 0) {
 		if (fileExists("/proc/1/environ")) {
 			string file = unsafeReadFile("/proc/1/environ");
 			if (file.size() > 0) {
@@ -59,7 +59,7 @@ _linuxAutoDetectInContainer() {
 
 		if (fileExists("/proc/1/sched")) {
 			string file = unsafeReadFile("/proc/1/sched");
-			if (file.length() >= 0) {
+			if (file.length() > 0) {
 				const char t = file[0];
 				if (t == '\0') {
 					return false;

data/src/cxx_supportlib/WebSocketCommandReverseServer.h

@@ -295,6 +295,10 @@ private:
 	bool reconnectAfterReply;
 	bool shuttingDown;
 
+	unsigned int secondsToMilis(double seconds) {
+		return (unsigned int) (seconds * 1000.0);
+	}
+
 	/**
 	 * It could happen that a certain method or handler is invoked
 	 * for a connection that has already been closed. For example,
@@ -528,7 +532,7 @@ private:
 				}
 			}
 
-			conn->set_proxy_timeout(config["proxy_timeout"].asDouble() * 1000, ec);
+			conn->set_proxy_timeout(secondsToMilis(config["proxy_timeout"].asDouble()), ec);
 			if (ec) {
 				P_ERROR(getLogPrefix()
 					<< "Error setting proxy timeout to "
@@ -538,9 +542,9 @@ private:
 			}
 		}
 
-		conn->set_open_handshake_timeout(config["connect_timeout"].asDouble() * 1000);
-		conn->set_pong_timeout(config["ping_timeout"].asDouble() * 1000);
-		conn->set_close_handshake_timeout(config["close_timeout"].asDouble() * 1000);
+		conn->set_open_handshake_timeout(secondsToMilis(config["connect_timeout"].asDouble()));
+		conn->set_pong_timeout(secondsToMilis(config["ping_timeout"].asDouble()));
+		conn->set_close_handshake_timeout(secondsToMilis(config["close_timeout"].asDouble()));
 
 		return true;
 	}
@@ -566,7 +570,7 @@ private:
 	void scheduleReconnect() {
 		P_NOTICE(getLogPrefix() << "Reestablishing connection in " <<
 			config["reconnect_timeout"].asDouble() << " seconds");
-		restartTimer(config["reconnect_timeout"].asDouble() * 1000);
+		restartTimer(secondsToMilis(config["reconnect_timeout"].asDouble()));
 	}
 
 	void closeConnection(websocketpp::close::status::value code,
@@ -626,7 +630,7 @@ private:
 		buffer.clear();
 		P_DEBUG(getLogPrefix() << "Scheduling next ping in " <<
 			config["ping_interval"].asDouble() << " seconds");
-		restartTimer(config["ping_interval"].asDouble() * 1000);
+		restartTimer(secondsToMilis(config["ping_interval"].asDouble()));
 	}
 
 	void onConnectFailed(ConnectionWeakPtr wconn) {
@@ -741,7 +745,7 @@ private:
 
 		P_DEBUG(getLogPrefix() << "Pong received. Scheduling next ping in " <<
 			config["ping_interval"].asDouble() << " seconds");
-		restartTimer(config["ping_interval"].asDouble() * 1000);
+		restartTimer(secondsToMilis(config["ping_interval"].asDouble()));
 	}
 
 	void onMessage(ConnectionWeakPtr wconn, MessagePtr msg) {

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

@@ -43,7 +43,6 @@ namespace boost {
             The result is given as an \c iterator_range delimiting the match.
 
             \param Search A substring to be searched for.
-            \param Comp An element comparison predicate
             \return An instance of the \c first_finder object
         */
         template<typename RangeT>
@@ -84,7 +83,6 @@ namespace boost {
             The result is given as an \c iterator_range delimiting the match.
 
             \param Search A substring to be searched for.
-            \param Comp An element comparison predicate
             \return An instance of the \c last_finder object
         */
         template<typename RangeT>
@@ -124,7 +122,6 @@ namespace boost {
 
             \param Search A substring to be searched for.
             \param Nth An index of the match to be find
-            \param Comp An element comparison predicate
             \return An instance of the \c nth_finder object
         */
         template<typename RangeT>
@@ -230,7 +227,6 @@ namespace boost {
 
             \param Begin Beginning of the range
             \param End End of the range
-            \param Range The range.
             \return An instance of the \c range_finger object
         */
         template< typename ForwardIteratorT >

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

@@ -23,7 +23,6 @@
 #include <string>
 #include <vector>
 #include <boost/asio/detail/array_fwd.hpp>
-#include <boost/asio/detail/is_buffer_sequence.hpp>
 #include <boost/asio/detail/string_view.hpp>
 #include <boost/asio/detail/throw_exception.hpp>
 #include <boost/asio/detail/type_traits.hpp>
@@ -347,41 +346,6 @@ public:
 
 #endif // !defined(BOOST_ASIO_NO_DEPRECATED)
 
-/// Trait to determine whether a type satisfies the MutableBufferSequence
-/// requirements.
-template <typename T>
-struct is_mutable_buffer_sequence
-#if defined(GENERATING_DOCUMENTATION)
-  : integral_constant<bool, automatically_determined>
-#else // defined(GENERATING_DOCUMENTATION)
-  : boost::asio::detail::is_buffer_sequence<T, mutable_buffer>
-#endif // defined(GENERATING_DOCUMENTATION)
-{
-};
-
-/// Trait to determine whether a type satisfies the ConstBufferSequence
-/// requirements.
-template <typename T>
-struct is_const_buffer_sequence
-#if defined(GENERATING_DOCUMENTATION)
-  : integral_constant<bool, automatically_determined>
-#else // defined(GENERATING_DOCUMENTATION)
-  : boost::asio::detail::is_buffer_sequence<T, const_buffer>
-#endif // defined(GENERATING_DOCUMENTATION)
-{
-};
-
-/// Trait to determine whether a type satisfies the DynamicBuffer requirements.
-template <typename T>
-struct is_dynamic_buffer
-#if defined(GENERATING_DOCUMENTATION)
-  : integral_constant<bool, automatically_determined>
-#else // defined(GENERATING_DOCUMENTATION)
-  : boost::asio::detail::is_dynamic_buffer<T>
-#endif // defined(GENERATING_DOCUMENTATION)
-{
-};
-
 /// (Deprecated: Use the socket/descriptor wait() and async_wait() member
 /// functions.) An implementation of both the ConstBufferSequence and
 /// MutableBufferSequence concepts to represent a null buffer sequence.
@@ -1404,7 +1368,7 @@ inline BOOST_ASIO_MUTABLE_BUFFER buffer(
       );
 }
 
-/// Create a new non-modifiable buffer that represents the given string.
+/// Create a new modifiable buffer that represents the given string.
 /**
  * @returns A mutable_buffer value equivalent to:
  * @code mutable_buffer(
@@ -2159,6 +2123,51 @@ inline std::size_t buffer_copy(const MutableBufferSequence& target,
 } // namespace asio
 } // namespace boost
 
+#include <boost/asio/detail/pop_options.hpp>
+#include <boost/asio/detail/is_buffer_sequence.hpp>
+#include <boost/asio/detail/push_options.hpp>
+
+namespace boost {
+namespace asio {
+
+/// Trait to determine whether a type satisfies the MutableBufferSequence
+/// requirements.
+template <typename T>
+struct is_mutable_buffer_sequence
+#if defined(GENERATING_DOCUMENTATION)
+  : integral_constant<bool, automatically_determined>
+#else // defined(GENERATING_DOCUMENTATION)
+  : boost::asio::detail::is_buffer_sequence<T, mutable_buffer>
+#endif // defined(GENERATING_DOCUMENTATION)
+{
+};
+
+/// Trait to determine whether a type satisfies the ConstBufferSequence
+/// requirements.
+template <typename T>
+struct is_const_buffer_sequence
+#if defined(GENERATING_DOCUMENTATION)
+  : integral_constant<bool, automatically_determined>
+#else // defined(GENERATING_DOCUMENTATION)
+  : boost::asio::detail::is_buffer_sequence<T, const_buffer>
+#endif // defined(GENERATING_DOCUMENTATION)
+{
+};
+
+/// Trait to determine whether a type satisfies the DynamicBuffer requirements.
+template <typename T>
+struct is_dynamic_buffer
+#if defined(GENERATING_DOCUMENTATION)
+  : integral_constant<bool, automatically_determined>
+#else // defined(GENERATING_DOCUMENTATION)
+  : boost::asio::detail::is_dynamic_buffer<T>
+#endif // defined(GENERATING_DOCUMENTATION)
+{
+};
+
+} // namespace asio
+} // namespace boost
+
 #include <boost/asio/detail/pop_options.hpp>
 
 #endif // BOOST_ASIO_BUFFER_HPP

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

@@ -59,7 +59,8 @@ struct is_endpoint_sequence
 /**
  * @defgroup connect boost::asio::connect
  *
- * @brief Establishes a socket connection by trying each endpoint in a sequence.
+ * @brief The @c connect function is a composed operation that establishes a
+ * socket connection by trying each endpoint in a sequence.
  */
 /*@{*/
 
@@ -132,8 +133,8 @@ typename Protocol::endpoint connect(
         EndpointSequence>::value>::type* = 0);
 
 #if !defined(BOOST_ASIO_NO_DEPRECATED)
-/// (Deprecated.) Establishes a socket connection by trying each endpoint in a
-/// sequence.
+/// (Deprecated: Use range overload.) Establishes a socket connection by trying
+/// each endpoint in a sequence.
 /**
  * This function attempts to connect a socket to one of a sequence of
  * endpoints. It does this by repeated calls to the socket's @c connect member
@@ -160,8 +161,8 @@ template <typename Protocol BOOST_ASIO_SVC_TPARAM, typename Iterator>
 Iterator connect(basic_socket<Protocol BOOST_ASIO_SVC_TARG>& s, Iterator begin,
     typename enable_if<!is_endpoint_sequence<Iterator>::value>::type* = 0);
 
-/// (Deprecated.) Establishes a socket connection by trying each endpoint in a
-/// sequence.
+/// (Deprecated: Use range overload.) Establishes a socket connection by trying
+/// each endpoint in a sequence.
 /**
  * This function attempts to connect a socket to one of a sequence of
  * endpoints. It does this by repeated calls to the socket's @c connect member
@@ -387,8 +388,8 @@ typename Protocol::endpoint connect(
         EndpointSequence>::value>::type* = 0);
 
 #if !defined(BOOST_ASIO_NO_DEPRECATED)
-/// (Deprecated.) Establishes a socket connection by trying each endpoint in a
-/// sequence.
+/// (Deprecated: Use range overload.) Establishes a socket connection by trying
+/// each endpoint in a sequence.
 /**
  * This function attempts to connect a socket to one of a sequence of
  * endpoints. It does this by repeated calls to the socket's @c connect member
@@ -428,8 +429,8 @@ Iterator connect(basic_socket<Protocol BOOST_ASIO_SVC_TARG>& s,
     Iterator begin, ConnectCondition connect_condition,
     typename enable_if<!is_endpoint_sequence<Iterator>::value>::type* = 0);
 
-/// (Deprecated.) Establishes a socket connection by trying each endpoint in a
-/// sequence.
+/// (Deprecated: Use range overload.) Establishes a socket connection by trying
+/// each endpoint in a sequence.
 /**
  * This function attempts to connect a socket to one of a sequence of
  * endpoints. It does this by repeated calls to the socket's @c connect member
@@ -603,8 +604,8 @@ Iterator connect(basic_socket<Protocol BOOST_ASIO_SVC_TARG>& s,
 /**
  * @defgroup async_connect boost::asio::async_connect
  *
- * @brief Asynchronously establishes a socket connection by trying each
- * endpoint in a sequence.
+ * @brief The @c async_connect function is a composed asynchronous operation
+ * that establishes a socket connection by trying each endpoint in a sequence.
  */
 /*@{*/
 
@@ -680,8 +681,8 @@ async_connect(basic_socket<Protocol BOOST_ASIO_SVC_TARG>& s,
         EndpointSequence>::value>::type* = 0);
 
 #if !defined(BOOST_ASIO_NO_DEPRECATED)
-/// (Deprecated.) Asynchronously establishes a socket connection by trying each
-/// endpoint in a sequence.
+/// (Deprecated: Use range overload.) Asynchronously establishes a socket
+/// connection by trying each endpoint in a sequence.
 /**
  * This function attempts to connect a socket to one of a sequence of
  * endpoints. It does this by repeated calls to the socket's @c async_connect
@@ -887,8 +888,8 @@ async_connect(basic_socket<Protocol BOOST_ASIO_SVC_TARG>& s,
         EndpointSequence>::value>::type* = 0);
 
 #if !defined(BOOST_ASIO_NO_DEPRECATED)
-/// (Deprecated.) Asynchronously establishes a socket connection by trying each
-/// endpoint in a sequence.
+/// (Deprecated: Use range overload.) Asynchronously establishes a socket
+/// connection by trying each endpoint in a sequence.
 /**
  * This function attempts to connect a socket to one of a sequence of
  * endpoints. It does this by repeated calls to the socket's @c async_connect