passenger 5.3.4 → 6.0.1

data/src/agent/Core/OptionParser.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -34,7 +34,7 @@
 #include <JsonTools/Autocast.h>
 #include <Utils.h>
 #include <Utils/OptionParsing.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 #include <jsoncpp/json.h>
 
@@ -94,7 +94,12 @@ coreUsage() {
 	printf("                            Disable the periodic check and notice about\n");
 	printf("                            important security updates\n");
 	printf("      --security-update-check-proxy PROXY\n");
-	printf("                            Use http/SOCKS proxy for the security update check:\n");
+	printf("                            Use HTTP/SOCKS proxy for the security update check:\n");
+	printf("                            scheme://user:password@proxy_host:proxy_port\n");
+	printf("      --disable-anonymous-telemetry\n");
+	printf("                            Disable anonymous telemetry collection\n");
+	printf("      --anonymous-telemetry-proxy PROXY\n");
+	printf("                            Use HTTP/SOCKS proxy for anonymous telemetry sending:\n");
 	printf("                            scheme://user:password@proxy_host:proxy_port\n");
 	printf("\n");
 	printf("Application serving options (optional):\n");
@@ -104,6 +109,9 @@ coreUsage() {
 	printf("                            (single-app mode only)\n");
 	printf("      --startup-file PATH   The path of the app's startup file, relative to\n");
 	printf("                            the app root directory (single-app mode only)\n");
+	printf("      --app-start-command COMMAND\n");
+	printf("                            The command string with which to start the app\n");
+	printf("                            (single-app mode only)\n");
 	printf("      --spawn-method NAME   Spawn method to use. Can either be 'smart' or\n");
 	printf("                            'direct'. Default: %s\n", DEFAULT_SPAWN_METHOD);
 	printf("      --load-shell-envvars  Load shell startup files before loading application\n");
@@ -282,6 +290,12 @@ parseCoreOption(int argc, const char *argv[], int &i, Json::Value &updates) {
 	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--security-update-check-proxy")) {
 		updates["security_update_checker_proxy_url"] = argv[i + 1];
 		i += 2;
+	} else if (p.isFlag(argv[i], '\0', "--disable-anonymous-telemetry")) {
+		updates["telemetry_collector_disabled"] = true;
+		i++;
+	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--anonymous-telemetry-proxy")) {
+		updates["telemetry_collector_proxy_url"] = argv[i + 1];
+		i += 2;
 	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--max-pool-size")) {
 		updates["max_pool_size"] = atoi(argv[i + 1]);
 		i += 2;
@@ -306,6 +320,9 @@ parseCoreOption(int argc, const char *argv[], int &i, Json::Value &updates) {
 	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--startup-file")) {
 		updates["single_app_mode_startup_file"] = argv[i + 1];
 		i += 2;
+	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--app-start-command")) {
+		updates["single_app_mode_app_start_command"] = argv[i + 1];
+		i += 2;
 	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--spawn-method")) {
 		updates["default_spawn_method"] = argv[i + 1];
 		i += 2;

data/src/agent/Core/ResponseCache.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2017 Phusion Holding B.V.
+ *  Copyright (c) 2014-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -34,8 +34,8 @@
 #include <ServerKit/http_parser.h>
 #include <ServerKit/CookieUtils.h>
 #include <StaticString.h>
-#include <Utils/DateParsing.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/DateParsing.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 

data/src/agent/Core/SecurityUpdateChecker.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2017 Phusion Holding B.V.
+ *  Copyright (c) 2017-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -33,7 +33,7 @@
 #include <oxt/thread.hpp>
 #include <oxt/backtrace.hpp>
 
-#include <Crypto.h>
+#include <SecurityKit/Crypto.h>
 #include <ResourceLocator.h>
 #include <Exceptions.h>
 #include <StaticString.h>
@@ -256,9 +256,11 @@ private:
 				error.append(" for proxy address " + sessionState.config["proxy_url"].asString());
 				break;
 
+#if LIBCURL_VERSION_NUM < 0x073e00
 			case CURLE_SSL_CACERT:
 				// Peer certificate cannot be authenticated with given / known CA certificates. This would happen
 				// for MITM but could also be a truststore issue.
+#endif
 			case CURLE_PEER_FAILED_VERIFICATION:
 				// The remote server's SSL certificate or SSH md5 fingerprint was deemed not OK.
 				error.append(" while connecting to " + sessionState.configRlz.url

data/src/agent/Core/SpawningKit/Config/AutoGeneratedCode.h

@@ -344,7 +344,7 @@ Passenger::SpawningKit::Config::getNonConfidentialFieldsToPassToApp() const {
 	doc["user"] = user.toString();
 	doc["group"] = group.toString();
 	doc["environment_variables"] = "<SECRET>";
-	doc["log_file"] = "<SECRET>";
+	doc["log_file"] = logFile.toString();
 	if (!config.apiKey.empty()) {
 		doc["api_key"] = "<SECRET>";
 	}

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

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -221,7 +221,7 @@ public:
 	StaticString processTitle;
 
 	/**
-	 * An application type name, e.g. "rack" or "node". The only use for this
+	 * An application type name, e.g. "ruby" or "nodejs". The only use for this
 	 * in SpawningKit is to better format error messages.
 	 *
 	 * @hinted_parseable
@@ -299,6 +299,7 @@ public:
 	 * to the given log file.
 	 *
 	 * @hinted_parseable
+	 * @non_confidential
 	 * @pass_during_handshake
 	 */
 	StaticString logFile;

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

@@ -36,7 +36,8 @@
 #include <ResourceLocator.h>
 #include <RandomGenerator.h>
 #include <Exceptions.h>
-#include <Utils/JsonUtils.h>
+#include <WrapperRegistry/Registry.h>
+#include <JsonTools/JsonUtils.h>
 #include <ConfigKit/Store.h>
 
 namespace Passenger {
@@ -132,7 +133,8 @@ private:
 public:
 	/****** Dependencies ******/
 
-	ResourceLocator *resourceLocator;
+	const ResourceLocator *resourceLocator;
+	const WrapperRegistry::Registry *wrapperRegistry;
 	RandomGeneratorPtr randomGenerator;
 	string integrationMode;
 	string instanceDir;
@@ -147,6 +149,7 @@ public:
 		  nextPort(0),
 
 		  resourceLocator(NULL),
+		  wrapperRegistry(NULL),
 		  debugSupport(NULL)
 	{
 		vector<ConfigKit::Error> errors;
@@ -185,6 +188,9 @@ public:
 		if (resourceLocator == NULL) {
 			throw RuntimeException("ResourceLocator not initialized");
 		}
+		if (wrapperRegistry == NULL) {
+			throw RuntimeException("WrapperRegistry not initialized");
+		}
 		if (randomGenerator == NULL) {
 			randomGenerator = boost::make_shared<RandomGenerator>();
 		}

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

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -36,7 +36,7 @@
 #include <Constants.h>
 #include <LoggingKit/LoggingKit.h>
 #include <LveLoggingDecorator.h>
-#include <Utils/IOUtils.h>
+#include <IOTools/IOUtils.h>
 #include <Utils/AsyncSignalSafeUtils.h>
 
 #include <limits.h>  // for PTHREAD_STACK_MIN
@@ -164,14 +164,14 @@ private:
 			dup2(stdinCopy, 0);
 			dup2(stdoutAndErrCopy, 1);
 			dup2(stdoutAndErrCopy, 2);
-			closeAllFileDescriptors(2, true);
+			closeAllFileDescriptors(2);
 
 			execlp(agentFilename.c_str(),
 				agentFilename.c_str(),
 				"spawn-env-setupper",
 				session.workDir->getPath().c_str(),
 				"--before",
-				NULL);
+				(char *) 0);
 
 			char *pos = buf;
 			e = errno;

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

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -31,7 +31,7 @@
 #include <vector>
 
 #include <StaticString.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 #include <Core/SpawningKit/Spawner.h>
 #include <Core/SpawningKit/Exceptions.h>
 
@@ -89,7 +89,7 @@ public:
 
 		result.initialize(*context, &config);
 		result.pid = number;
-		result.dummy = true;
+		result.type = Result::DUMMY;
 		result.gupid = "gupid-" + toString(number);
 		result.spawnEndTime = result.spawnStartTime;
 		result.spawnEndTimeMonotonic = result.spawnStartTimeMonotonic;

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

@@ -35,7 +35,7 @@
 #include <Constants.h>
 #include <StaticString.h>
 #include <FileTools/FileManip.h>
-#include <Utils/Template.h>
+#include <StrIntTools/Template.h>
 #include <Core/SpawningKit/Context.h>
 #include <Core/SpawningKit/Exceptions.h>
 

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

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -29,14 +29,15 @@
 #include <oxt/tracable_exception.hpp>
 #include <string>
 #include <stdexcept>
+#include <limits>
 
 #include <Constants.h>
 #include <Exceptions.h>
 #include <LoggingKit/LoggingKit.h>
 #include <DataStructures/StringKeyTable.h>
 #include <ProcessManagement/Spawn.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/SystemMetricsCollector.h>
+#include <SystemTools/SystemMetricsCollector.h>
+#include <StrIntTools/StrIntUtils.h>
 #include <Core/SpawningKit/Config.h>
 #include <Core/SpawningKit/Journey.h>
 
@@ -121,6 +122,7 @@ private:
 				message = "A timeout occurred while spawning an application process";
 				break;
 			}
+			break;
 		default:
 			string categoryPhraseWithIndefiniteArticle =
 				getErrorCategoryPhraseWithIndefiniteArticle(
@@ -137,6 +139,7 @@ private:
 						+ " occurred while starting a preloader process";
 					break;
 				}
+				break;
 			default:
 				switch (journey.getFirstFailedStep()) {
 				case SPAWNING_KIT_PREPARATION:
@@ -172,7 +175,9 @@ private:
 						+ " occurred while spawning an application process";
 					break;
 				}
+				break;
 			}
+			break;
 		}
 
 		if (advancedProblemDetails.empty()) {
@@ -602,7 +607,7 @@ private:
 					" scripts.</p>");
 				break;
 			case SUBPROCESS_APP_LOAD_OR_EXEC:
-				if (config.appType == "node") {
+				if (config.appType == "nodejs") {
 					message.append(
 						"<h3>Check whether the application calls <code>http.Server.listen()</code></h3>"
 						"<p>" SHORT_PROGRAM_NAME " requires that the application calls"
@@ -736,12 +741,13 @@ private:
 		const char *command[] = { "/bin/sh", "-c", "ulimit -a", NULL };
 		try {
 			SubprocessInfo info;
-			string result;
-			runCommandAndCaptureOutput(command, info, result);
-			if (result.empty()) {
-				result.assign("Error: command 'ulimit -a' failed");
+			SubprocessOutput output;
+			runCommandAndCaptureOutput(command, info, output,
+				std::numeric_limits<size_t>::max());
+			if (output.data.empty()) {
+				output.data.assign("Error: command 'ulimit -a' failed");
 			}
-			return result;
+			return output.data;
 		} catch (const SystemException &e) {
 			return P_STATIC_STRING("Error: command 'ulimit -a' failed: ") + e.what();
 		}
@@ -751,12 +757,13 @@ private:
 		const char *command[] = { "id", "-a", NULL };
 		try {
 			SubprocessInfo info;
-			string result;
-			runCommandAndCaptureOutput(command, info, result);
-			if (result.empty()) {
-				result.assign("Error: command 'id -a' failed");
+			SubprocessOutput output;
+			runCommandAndCaptureOutput(command, info, output,
+				std::numeric_limits<size_t>::max());
+			if (output.data.empty()) {
+				output.data.assign("Error: command 'id -a' failed");
 			}
-			return result;
+			return output.data;
 		} catch (const SystemException &e) {
 			return P_STATIC_STRING("Error: command 'id -a' failed: ") + e.what();
 		}

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

@@ -48,7 +48,7 @@ private:
 	SpawnerPtr tryCreateSmartSpawner(const AppPoolOptions &options) {
 		string dir = context->resourceLocator->getHelperScriptsDir();
 		vector<string> preloaderCommand;
-		if (options.appType == "rack") {
+		if (options.appType == "ruby" || options.appType == "rack") {
 			preloaderCommand.push_back(options.ruby);
 			preloaderCommand.push_back(dir + "/rack-preloader.rb");
 		} else {

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

@@ -42,7 +42,7 @@
 #include <FileDescriptor.h>
 #include <StaticString.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 namespace SpawningKit {

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

@@ -52,8 +52,8 @@
 #include <FileTools/PathManip.h>
 #include <Utils.h>
 #include <Utils/ScopeGuard.h>
-#include <Utils/SystemTime.h>
-#include <Utils/StrIntUtils.h>
+#include <SystemTools/SystemTime.h>
+#include <StrIntTools/StrIntUtils.h>
 #include <Core/SpawningKit/Config.h>
 #include <Core/SpawningKit/Exceptions.h>
 #include <Core/SpawningKit/Handshake/BackgroundIOCapturer.h>
@@ -202,6 +202,7 @@ private:
 				socketIsNowPingable = true;
 				finishState = FINISH_SUCCESS;
 				wakeupEventLoop();
+				break;
 			} else {
 				syscalls::usleep(50000);
 			}
@@ -297,6 +298,7 @@ private:
 		result.stdoutAndErrFd = stdoutAndErrFd;
 		result.spawnEndTime = SystemTime::getUsec();
 		result.spawnEndTimeMonotonic = SystemTime::getMonotonicUsec();
+		setResultType(result);
 
 		if (socketIsNowPingable) {
 			assert(config->genericApp || config->findFreePort);
@@ -1674,6 +1676,16 @@ private:
 		return result;
 	}
 
+	void setResultType(Result &result) const {
+		if (config->genericApp) {
+			result.type = Result::GENERIC;
+		} else if (config->startsUsingWrapper) {
+			result.type = Result::AUTO_SUPPORTED;
+		} else {
+			result.type = Result::KURIA;
+		}
+	}
+
 public:
 	struct DebugSupport {
 		virtual ~DebugSupport() { }

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

@@ -56,10 +56,10 @@
 #include <FileTools/FileManip.h>
 #include <FileTools/PathManip.h>
 #include <SystemTools/UserDatabase.h>
-#include <Utils/SystemTime.h>
+#include <SystemTools/SystemTime.h>
 #include <Utils/Timer.h>
-#include <Utils/IOUtils.h>
-#include <Utils/StrIntUtils.h>
+#include <IOTools/IOUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 #include <Core/SpawningKit/Context.h>
 #include <Core/SpawningKit/Config.h>
 #include <Core/SpawningKit/Journey.h>

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

@@ -36,7 +36,7 @@
 
 #include <Exceptions.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 namespace SpawningKit {

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

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2017 Phusion Holding B.V.
+ *  Copyright (c) 2017-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -36,10 +36,9 @@
 
 #include <LoggingKit/LoggingKit.h>
 #include <StaticString.h>
-#include <Utils/SystemTime.h>
-#include <Utils/JsonUtils.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/SystemTime.h>
+#include <SystemTools/SystemTime.h>
+#include <JsonTools/JsonUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 namespace SpawningKit {

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

@@ -43,7 +43,7 @@
 #include <Constants.h>
 #include <LoggingKit/LoggingKit.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 namespace SpawningKit {

data/src/agent/Core/SpawningKit/README.md

@@ -6,7 +6,7 @@ Spawning an application process is complex, involving many steps and with many f
 
 Here is how SpawningKit is used. The caller supplies various parameters such as where the application is located, what language it's written in, what environment variables to apply, etc. SpawningKit then spawns the application process, checks whether the application spawned properly or whether it encountered an error, and then either returns an object that describes the resulting process or throws an exception that describes the failure.
 
-Reliability and visibility are core features in SpawningKit. When SpawningKit returns, you know for sure whether the process started correctly or not. If the application did not start correctly, then the resulting exception describes the failure in a detailed enough manner that allows users to pinpoint the source of the problem. SpawningKit also enforces timeouts everywhere so that stuck processes are handled as well.
+Reliability and visibility are core features of SpawningKit. When SpawningKit returns, you know for sure whether the process started correctly or not. If the application did not start correctly, then the resulting exception describes the failure in a detailed enough manner that allows users to pinpoint the source of the problem. SpawningKit also enforces timeouts everywhere so that stuck processes are handled as well.
 
 **Table of contents**:
 
@@ -17,6 +17,13 @@ Reliability and visibility are core features in SpawningKit. When SpawningKit re
    - The start command
    - Summary with examples
  * API and implementation highlights
+   - Context
+   - Spawners (high-level API)
+   - HandshakePrepare and HandshakePerform (low-level API)
+   - Configuration object
+   - Exception object
+   - Journey
+   - ErrorRenderer
  * Overview of the spawning journey
    - When spawning a process without a preloader
    - When starting a preloader
@@ -42,19 +49,39 @@ Reliability and visibility are core features in SpawningKit. When SpawningKit re
 
 ### Generic vs SpawningKit-enabled applications
 
+    All applications
+     |
+     +-- Generic applications
+     |   (without explicit SpawningKit support; `genericApp = true`)
+     |
+     +-- SpawningKit-enabled applications
+         (with explicit SpawningKit support; `genericApp = false`)
+           |
+           +-- Applications with SpawningKit support automatically injected
+           |   through a "wrapper"; no manual modifications
+           |   (`startsUsingWrapper = true`)
+           |
+           +-- Applications manually modified with SpawningKit support
+               (`startsUsingWrapper = false`)
+
 SpawningKit can be used to spawn any web application, both those with and without explicit SpawningKit support.
 
+> A generic application corresponds to setting the SpawningKit config `genericApp = true`.
+
 When SpawningKit is used to spawn a generic application (without explicit SpawningKit support), the only requirement is that the application can be instructed to start and to listen on a specific TCP port on localhost. The user needs to specify a command string that tells SpawningKit how that is to be done. SpawningKit then looks for a free port that the application may use and executes the application using the supplied command string, telling it to listen on that specific port. (This approach is inspired by Heroku's Procfile system.) SpawningKit waits until the application is up by pinging the port. If the application fails (e.g. by terminating early or by not responding to pings in time) then SpawningKit will abort, reporting the application's stdout and stderr output.
 
+> A SpawningKit-enabled application corresponds to setting the SpawningKit config `genericApp = false`.
+
 Applications can also be modified with explicit SpawningKit support. Such applications can improve performance by telling SpawningKit that it wishes to listen on a Unix domain socket instead of a TCP socket; and they can provide more feedback about any spawning failures, such as with HTML-formatted error messages or by providing more information about where internally in the application or web framework the failure occurred.
 
 ### Wrappers
 
-In general, it is better if an application has explicit SpawningKit support, because then it is able to provide a nicer experience and better performance. But having to modify the application's code is a major hurdle.
+As we said, apps with explicit SpawningKit support is preferred (nicer experience, better performance). There are two ways to add SpawningKit support to an app:
 
-Luckily, it is not always necessary to modify the application. Wrappers are small programs that aid in loading applications written in specific languages -- in particular interpreted languages because they allow modifying application behavior without requiring code modifications. When a wrapper is used, SpawningKit executes the wrapper, not the actual application. The wrapper loads the application and modifies its behavior in such a way that SpawningKit support is added (e.g. ability to report HTML-formatted errors), without requiring modifications to the application code.
+ 1. By manually modifying the application's code to add SpawningKit support.
+ 2. By automatically injecting SpawningKit support into the app, without any manual code modifications.
 
-Wrappers are only applicable to apps without explicit SpawningKit support.
+Option 2 is the most desirable, and is available to apps written in interpreted languages. This works by executing the application through a *wrapper* instead of directly. The wrapper, which is typically written in the same language as the app, loads the application and injects SpawningKit support.
 
 Passenger comes with a few wrappers for specific languages, but SpawningKit itself is more generic and requires the caller to specify which wrapper to use (if at all).
 
@@ -86,15 +113,7 @@ Using the preforking technique through SpawningKit requires either application c
 
 ### The start command
 
-Regardless of whether SpawningKit is used to spawn an application with or without explicit SpawningKit support, and regardless of whether a wrapper is used and whether the application/wrapper can function as a preloader, SpawningKit asks the caller to supply a "start command" that tells it how to execute the wrapper or the application. SpawningKit then uses the handshaking procedure (see: "Overview of the spawning journey") to communicate with the wrapper/application whether it should start in preloader mode or not.
-
-### Summary with examples
-
-To help you better understand the concepts, the following summarizes some of the above concepts and how they map to supportable languages.
-
-SpawningKit-enabled wrappers are included in Passenger for these languages: Ruby, Python, Node.js, Meteor, and Perl.
-
-Any existing app that accepts http requests can be used by writing a wrapper, and any new app can be written with SpawningKit compatibility to avoid the need for a wrapper.
+Regardless of whether SpawningKit is used to spawn an application directly with or without explicit SpawningKit support, and regardless of whether a wrapper is used and whether the application/wrapper can function as a preloader, SpawningKit asks the caller to supply a "start command" that tells it how to execute the wrapper or the application. SpawningKit then uses the handshaking procedure (see: "Overview of the spawning journey") to communicate with the wrapper/application whether it should start in preloader mode or not.
 
 
 ## API and implementation highlights
@@ -114,7 +133,7 @@ context.integrationMode = "standalone";
 context.finalize();
 ~~~
 
-### Spawners
+### Spawners (high-level API)
 
 Use Spawners to spawn application processes. There are two main types of Spawners:
 
@@ -144,7 +163,7 @@ P_WARN("Application process spawned, PID is " << result.pid);
 
 There is also a DummySpawner class, which is only used during unit tests.
 
-### HandshakePrepare and HandshakePerform
+### HandshakePrepare and HandshakePerform (low-level API)
 
 Inside SmartSpawner and DirectSpawner, HandshakePrepare and HandshakePerform are used to perform a lot of the heavy lifting. See "Overview of the spawning journey" -- HandshakePrepare and HandshakePerform are responsible for most of the stuff described there.
 
@@ -152,8 +171,6 @@ In fact, DirectSpawner is just a thin wrapper around HandshakePrepare and Handsh
 
 SmartSpawner is a bit bigger because it needs to implement the whole preloading mechanism (see section "Preloaders"), but it still uses HandshakePrepare and HandshakePerform to spawn the preloader, and to negotiate with the subprocess created by the preloader.
 
-Here are some simplified interaction diagrams.
-
 ### Configuration object
 
 HandshakePrepare and HandshakePerform do not accept an ApplicationPool::Options object, but a SpawningKit::Config object. It contains the configuration that HandshakePrepare/Perform need to perform a single spawn. SmartSpawner and DirectSpawner internally convert an ApplicationPool::Options into a SpawningKit::Config.

data/src/agent/Core/SpawningKit/Result/AutoGeneratedCode.h

@@ -60,7 +60,7 @@ Passenger::SpawningKit::Result::validate_autoGeneratedCode(vector<StaticString>
 	/*
 	 * Excluded:
 	 *
-	 * dummy
+	 * type
 	 * codeRevision
 	 * stdinFd
 	 * stdoutAndErrFd