passenger 6.0.8 → 6.0.20

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

@@ -99,6 +99,7 @@ parseControllerBenchmarkMode(const StaticString &mode) {
  *   default_meteor_app_settings                         string             -          -
  *   default_min_instances                               unsigned integer   -          default(1)
  *   default_nodejs                                      string             -          default("node")
+ *   default_preload_bundler                             boolean            -          default(false)
  *   default_python                                      string             -          default("python")
  *   default_ruby                                        string             -          default("ruby")
  *   default_server_name                                 string             required   -
@@ -115,7 +116,7 @@ parseControllerBenchmarkMode(const StaticString &mode) {
  *   multi_app                                           boolean            -          default(true),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.8")
+ *   server_software                                     string             -          default("Phusion_Passenger/6.0.20")
  *   show_version_in_header                              boolean            -          default(true)
  *   start_reading_after_accept                          boolean            -          default(true)
  *   stat_throttle_rate                                  unsigned integer   -          default(10)
@@ -165,6 +166,7 @@ private:
 		add("default_spawn_method", STRING_TYPE, OPTIONAL, DEFAULT_SPAWN_METHOD);
 		add("default_bind_address", STRING_TYPE, OPTIONAL, DEFAULT_BIND_ADDRESS);
 		add("default_load_shell_envvars", BOOL_TYPE, OPTIONAL, false);
+		add("default_preload_bundler", BOOL_TYPE, OPTIONAL, false);
 		add("default_meteor_app_settings", STRING_TYPE, OPTIONAL);
 		add("default_app_file_descriptor_ulimit", UINT_TYPE, OPTIONAL);
 		add("default_min_instances", UINT_TYPE, OPTIONAL, 1);
@@ -440,6 +442,7 @@ public:
 	bool showVersionInHeader: 1;
 	bool defaultAbortWebsocketsOnProcessShutdown;
 	bool defaultLoadShellEnvvars;
+	bool defaultPreloadBundler;
 
 	/*******************/
 	/*******************/
@@ -473,7 +476,8 @@ public:
 		  defaultForceMaxConcurrentRequestsPerProcess(config["default_force_max_concurrent_requests_per_process"].asInt()),
 		  showVersionInHeader(config["show_version_in_header"].asBool()),
 		  defaultAbortWebsocketsOnProcessShutdown(config["default_abort_websockets_on_process_shutdown"].asBool()),
-		  defaultLoadShellEnvvars(config["default_load_shell_envvars"].asBool())
+		  defaultLoadShellEnvvars(config["default_load_shell_envvars"].asBool()),
+		  defaultPreloadBundler(config["default_preload_bundler"].asBool())
 
 		  /*******************/
 		{ }

data/src/agent/Core/Controller/InitRequest.cpp

@@ -202,6 +202,7 @@ Controller::fillPoolOptionsFromConfigCaches(Options &options,
 	options.spawnMethod = requestConfig->defaultSpawnMethod;
 	options.bindAddress = requestConfig->defaultBindAddress;
 	options.loadShellEnvvars = requestConfig->defaultLoadShellEnvvars;
+	options.preloadBundler = requestConfig->defaultPreloadBundler;
 	options.statThrottleRate = mainConfig.statThrottleRate;
 	options.maxRequests = requestConfig->defaultMaxRequests;
 	options.stickySessionsCookieAttributes = requestConfig->defaultStickySessionsCookieAttributes;
@@ -378,6 +379,7 @@ Controller::createNewPoolOptions(Client *client, Request *req,
 	fillPoolOption(req, options.restartDir, "!~PASSENGER_RESTART_DIR");
 	fillPoolOption(req, options.startupFile, "!~PASSENGER_STARTUP_FILE");
 	fillPoolOption(req, options.loadShellEnvvars, "!~PASSENGER_LOAD_SHELL_ENVVARS");
+	fillPoolOption(req, options.preloadBundler, "!~PASSENGER_PRELOAD_BUNDLER");
 	fillPoolOption(req, options.fileDescriptorUlimit, "!~PASSENGER_APP_FILE_DESCRIPTOR_ULIMIT");
 	fillPoolOption(req, options.raiseInternalError, "!~PASSENGER_RAISE_INTERNAL_ERROR");
 	fillPoolOption(req, options.lveMinUid, "!~PASSENGER_LVE_MIN_UID");

data/src/agent/Core/Controller/InternalUtils.cpp

@@ -96,7 +96,7 @@ Controller::endRequestWithAppSocketIncompleteResponse(Client **client, Request *
 			SKC_WARN(*client, "Sending 502 response: application did not send a complete response");
 		}
 		endRequestWithSimpleResponse(client, req,
-			"<h2>Incomplete response received from application</h2>", 502);
+			getFormattedMessage(*req, "Incomplete response received from application"), 502);
 	} else {
 		disconnectWithAppSocketIncompleteResponseError(client);
 	}
@@ -107,12 +107,39 @@ Controller::endRequestWithAppSocketReadError(Client **client, Request **req, int
 	Client *c = *client;
 	if (!(*req)->responseBegun) {
 		SKC_WARN(*client, "Sending 502 response: application socket read error");
-		endRequestWithSimpleResponse(client, req, "<h2>Application socket read error</h2>", 502);
+		endRequestWithSimpleResponse(client, req,
+			getFormattedMessage(*req, "Application socket read error"), 502);
 	} else {
 		disconnectWithAppSocketReadError(&c, e);
 	}
 }
 
+ServerKit::HeaderTable
+Controller::getHeadersWithContentType(Request *req)
+{
+	ServerKit::HeaderTable headers;
+	const LString *value = req->headers.lookup(P_STATIC_STRING("content-type"));
+	if (value != NULL) {
+		if (psg_lstr_cmp(value, P_STATIC_STRING("application/json"))) {
+			headers.insert(req->pool, "content-type", "application/json");
+		}
+		// Here we can extend setting `content-type` with more supported formats, ie: xml,...
+	}
+	return headers;
+}
+
+const string
+Controller::getFormattedMessage(Request *req, const StaticString &body)
+{
+	const LString *value = req->headers.lookup(P_STATIC_STRING("content-type"));
+	if (value != NULL) {
+		if (psg_lstr_cmp(value, P_STATIC_STRING("application/json"))) {
+			return "{\"status\":\"error\", \"message\": \""+body+"\"}";
+		}
+	}
+	return "<h1>"+body+"</h1>";
+}
+
 /**
  * `data` must outlive the request.
  */
@@ -122,8 +149,7 @@ Controller::endRequestWithSimpleResponse(Client **c, Request **r,
 {
 	Client *client = *c;
 	Request *req = *r;
-	ServerKit::HeaderTable headers;
-
+	ServerKit::HeaderTable headers = getHeadersWithContentType(req);
 	headers.insert(req->pool, "cache-control", "no-cache, no-store, must-revalidate");
 	writeSimpleResponse(client, code, &headers, body);
 	endRequest(c, r);
@@ -134,9 +160,9 @@ Controller::endRequestAsBadGateway(Client **client, Request **req) {
 	if ((*req)->responseBegun) {
 		disconnectWithError(client, "bad gateway");
 	} else {
-		ServerKit::HeaderTable headers;
+		ServerKit::HeaderTable headers = getHeadersWithContentType(*req);
 		headers.insert((*req)->pool, "cache-control", "no-cache, no-store, must-revalidate");
-		writeSimpleResponse(*client, 502, &headers, "<h1>Bad Gateway</h1>");
+		writeSimpleResponse(*client, 502, &headers, getFormattedMessage(*req, "Bad Gateway"));
 		endRequest(client, req);
 	}
 }

data/src/agent/Core/Controller.h

@@ -207,6 +207,7 @@ private:
 	static void checkoutSessionLater(Request *req);
 	void reportSessionCheckoutError(Client *client, Request *req,
 		const ExceptionPtr &e);
+	int lookupCodeFromHeader(Request *req, const char* header, int statusCode);
 	void writeRequestQueueFullExceptionErrorResponse(Client *client,
 		Request *req, const boost::shared_ptr<RequestQueueFullException> &e);
 	void writeSpawnExceptionErrorResponse(Client *client, Request *req,
@@ -214,7 +215,7 @@ private:
 	void writeOtherExceptionErrorResponse(Client *client, Request *req,
 		const ExceptionPtr &e);
 	void endRequestWithErrorResponse(Client **c, Request **r,
-		const SpawningKit::SpawnException &e);
+		const SpawningKit::SpawnException &e, int statusCode);
 	bool friendlyErrorPagesEnabled(Request *req);
 
 
@@ -313,6 +314,8 @@ private:
 		Request **req);
 	void endRequestWithAppSocketReadError(Client **client, Request **req,
 		int e);
+	ServerKit::HeaderTable getHeadersWithContentType(Request *req);
+	const string getFormattedMessage(Request *req, const StaticString &body);
 	void endRequestWithSimpleResponse(Client **c, Request **r,
 		const StaticString &body, int code = 200);
 	void endRequestAsBadGateway(Client **client, Request **req);

data/src/agent/Core/OptionParser.h

@@ -115,6 +115,7 @@ coreUsage() {
 	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");
+	printf("      --preload-bundler     Tell Ruby to load bundler gem before loading application\n");
 	printf("      --concurrency-model   The concurrency model to use for the app, either\n");
 	printf("                            'process' or 'thread' (Enterprise only).\n");
 	printf("                            Default: " DEFAULT_CONCURRENCY_MODEL "\n");
@@ -332,6 +333,9 @@ parseCoreOption(int argc, const char *argv[], int &i, Json::Value &updates) {
 	} else if (p.isFlag(argv[i], '\0', "--load-shell-envvars")) {
 		updates["default_load_shell_envvars"] = true;
 		i++;
+	} else if (p.isFlag(argv[i], '\0', "--preload-bundler")) {
+		updates["default_preload_bundler"] = true;
+		i++;
 	} else if (p.isFlag(argv[i], '\0', "--multi-app")) {
 		updates["multi_app"] = true;
 		i++;

data/src/agent/Core/SecurityUpdateChecker.h

@@ -322,7 +322,7 @@ private:
 				error.append("url not found: " + sessionState.configRlz.url + " " POSSIBLE_MITM_RESOLUTION);
 				break;
 			case 403:
-				error.append("connection denied by server " POSSIBLE_MITM_RESOLUTION);
+				error.append("request forbidden by server " POSSIBLE_MITM_RESOLUTION);
 				break;
 			case 503:
 				error.append("server temporarily unavailable, try again later");
@@ -646,7 +646,7 @@ public:
 			string data64 = responseJson["data"].asString();
 
 			signatureChars = (char *)malloc(modp_b64_decode_len(signature64.length()));
-			dataChars = (char *)malloc(modp_b64_decode_len(data64.length()));
+			dataChars = (char *)malloc(modp_b64_decode_len(data64.length()) + 1);
 			if (signatureChars == NULL || dataChars == NULL) {
 				logUpdateFailResponse("out of memory", responseData);
 				break;
@@ -667,14 +667,14 @@ public:
 			int dataLen;
 			dataLen = modp_b64_decode(dataChars, data64.c_str(), data64.length());
 			if (dataLen <= 0) {
-				logUpdateFailResponse("corrupted data", responseData);
+				logUpdateFailResponse("corrupted data", data64.c_str());
 				break;
 			}
 			dataChars[dataLen] = '\0';
 
 			Json::Value responseDataJson;
 			if (!reader.parse(dataChars, responseDataJson, false)) {
-				logUpdateFailResponse("unparseable data", responseData);
+				logUpdateFailResponse("unparseable data", dataChars);
 				break;
 			}
 			P_DEBUG("data content (signature OK): " << responseDataJson.toStyledString());

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

@@ -258,6 +258,7 @@ Passenger::SpawningKit::Config::validate(vector<StaticString> &errors) const {
 	 * startsUsingWrapper
 	 * wrapperSuppliedByThirdParty
 	 * findFreePort
+	 * preloadBundler
 	 * loadShellEnvvars
 	 * debugWorkDir
 	 * processTitle
@@ -287,6 +288,9 @@ Passenger::SpawningKit::Config::getConfidentialFieldsToPassToApp() const {
 	if (!config.genericApp && config.startsUsingWrapper) {
 		doc["wrapper_supplied_by_third_party"] = wrapperSuppliedByThirdParty;
 	}
+	if (config.appType == "ruby") {
+		doc["preload_bundler"] = preloadBundler;
+	}
 	doc["load_shell_envvars"] = loadShellEnvvars;
 	doc["start_command"] = startCommand.toString();
 	if (!config.genericApp && config.startsUsingWrapper) {
@@ -341,6 +345,9 @@ Passenger::SpawningKit::Config::getNonConfidentialFieldsToPassToApp() const {
 	if (!config.genericApp && config.startsUsingWrapper) {
 		doc["wrapper_supplied_by_third_party"] = wrapperSuppliedByThirdParty;
 	}
+	if (config.appType == "ruby") {
+		doc["preload_bundler"] = preloadBundler;
+	}
 	doc["load_shell_envvars"] = loadShellEnvvars;
 	doc["start_command"] = startCommand.toString();
 	if (!config.genericApp && config.startsUsingWrapper) {

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

@@ -156,6 +156,18 @@ public:
 	 */
 	bool findFreePort: 1;
 
+	/**
+	 * Whether Passenger should tell Ruby to preload bundler,
+	 * this is to help deal with multiple versions of gems
+	 * being installed, which is due to updates of default gems.
+	 *
+	 * @hinted_parseable
+	 * @pass_during_handshake
+	 * @only_meaningful_if config.appType == "ruby"
+	 * @non_confidential
+	 */
+	bool preloadBundler: 1;
+
 	/**
 	 * Whether to load environment variables set in shell startup
 	 * files (e.g. ~/.bashrc) during spawning.
@@ -371,6 +383,7 @@ public:
 		  startsUsingWrapper(false),
 		  wrapperSuppliedByThirdParty(false),
 		  findFreePort(false),
+		  preloadBundler(false),
 		  loadShellEnvvars(false),
 		  debugWorkDir(false),
 		  appEnv(P_STATIC_STRING(DEFAULT_APP_ENV)),

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

@@ -249,6 +249,10 @@ private:
 		args["integration_mode"] = context->integrationMode;
 		args["gupid"] = session.result.gupid;
 		args["UNIX_PATH_MAX"] = (Json::UInt64) sizeof(addr.sun_path) - 1;
+
+		if (config->preloadBundler) {
+			args["preload_bundler"] = config->preloadBundler;
+		}
 		if (config->genericApp || config->findFreePort) {
 			args["expected_start_port"] = session.expectedStartPort;
 		}

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

@@ -63,6 +63,8 @@ private:
 	string logFile;
 	boost::mutex startSyncher;
 	boost::condition_variable startCond;
+	size_t bufSize;
+	char *buf;
 
 	static void threadMain(boost::shared_ptr<PipeWatcher> self) {
 		TRACE_POINT();
@@ -90,11 +92,12 @@ private:
 
 		UPDATE_TRACE_POINT();
 		while (!boost::this_thread::interruption_requested()) {
-			char buf[1024 * 8];
 			ssize_t ret;
+			
+			buf[0] = '\0';
 
 			UPDATE_TRACE_POINT();
-			ret = syscalls::read(fd, buf, sizeof(buf));
+			ret = syscalls::read(fd, buf, bufSize);
 			if (ret == 0) {
 				break;
 			} else if (ret == -1) {
@@ -150,14 +153,26 @@ public:
 		  appGroupName(_appGroupName),
 		  appLogFile(_appLogFile),
 		  pid(_pid),
-		  started(false)
+		  started(false),
+		  bufSize(1024 * 8),
+		  buf(NULL)
 		{ }
 
+	~PipeWatcher() {
+		delete[] buf;
+	}
+
 	void setLogFile(const string &path) {
 		logFile = path;
 	}
 
 	void initialize() {
+		const char *envMaxLogBytes = getenv("PASSENGER_MAX_LOG_LINE_LENGTH_BYTES");
+		if (envMaxLogBytes != NULL && *envMaxLogBytes != '\0') {
+			bufSize = atoi(envMaxLogBytes);
+		}
+		buf = new char[bufSize];
+
 		oxt::thread(boost::bind(threadMain, shared_from_this()),
 			"PipeWatcher: PID " + toString(pid) + " " + name + ", fd " + toString(fd),
 			POOL_HELPER_THREAD_STACK_SIZE);

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

@@ -114,6 +114,7 @@ protected:
 		config->logLevel = options.logLevel;
 		config->wrapperSuppliedByThirdParty = false;
 		config->findFreePort = false;
+		config->preloadBundler = options.preloadBundler;
 		config->loadShellEnvvars = options.loadShellEnvvars;
 		config->startupFile = options.getStartupFile(*context->wrapperRegistry);
 		config->appType = options.appType;

data/src/agent/Shared/ApplicationPoolApiKey.h

@@ -102,6 +102,8 @@ public:
 		memcpy(value, other.data(), SIZE);
 	}
 
+	ApiKey& operator=(const ApiKey &other) = default;
+
 	ApiKey(const ApiKey &other) {
 		memcpy(value, other.value, SIZE);
 	}

data/src/agent/SpawnEnvSetupper/SpawnEnvSetupperMain.cpp

@@ -686,6 +686,20 @@ setCurrentWorkingDirectory(const Context &context) {
 	setenv("PWD", appRoot.c_str(), 1);
 }
 
+string
+findRubyopt(const Json::Value &args) {
+	if (!args.isMember("environment_variables")) return "";
+	const Json::Value &envvars = args["environment_variables"];
+	Json::Value::const_iterator it, end = envvars.end();
+
+	for (it = envvars.begin(); it != end; it++) {
+		if (it.name() == "RUBYOPT") {
+			return it->asString();
+		}
+	}
+	return "";
+}
+
 static void
 setDefaultEnvvars(const Json::Value &args) {
 	setenv("PYTHONUNBUFFERED", "1", 1);
@@ -702,6 +716,11 @@ setDefaultEnvvars(const Json::Value &args) {
 		setenv("PORT", toString(args["expected_start_port"].asInt()).c_str(), 1);
 	}
 
+	if (args.isMember("preload_bundler") && args["preload_bundler"].asBool()) {
+		string rubyopt = findRubyopt(args) + " -r bundler/setup";
+		setenv("RUBYOPT", rubyopt.c_str(), 1);
+	}
+
 	if (args["base_uri"].asString() != "/") {
 		setenv("RAILS_RELATIVE_URL_ROOT", args["base_uri"].asCString(), 1);
 		setenv("RACK_BASE_URI", args["base_uri"].asCString(), 1);
@@ -720,7 +739,14 @@ setGivenEnvVars(const Json::Value &args) {
 
 	for (it = envvars.begin(); it != end; it++) {
 		string key = it.name();
-		setenv(key.c_str(), it->asCString(), 1);
+		string value = it->asString();
+		if(args.isMember("preload_bundler") &&
+		   args["preload_bundler"].asBool()){
+			if (key == "RUBYOPT") {
+				value += " -r bundler/setup";
+			}
+		}
+		setenv(key.c_str(), value.c_str(), 1);
 	}
 }
 

data/src/agent/Watchdog/Config.h

@@ -115,6 +115,7 @@ using namespace std;
  *   default_meteor_app_settings                                              string             -          -
  *   default_min_instances                                                    unsigned integer   -          default(1)
  *   default_nodejs                                                           string             -          default("node")
+ *   default_preload_bundler                                                  boolean            -          default(false)
  *   default_python                                                           string             -          default("python")
  *   default_ruby                                                             string             -          default("ruby")
  *   default_server_name                                                      string             -          default
@@ -153,7 +154,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.8")
+ *   server_software                                                          string             -          default("Phusion_Passenger/6.0.20")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only

data/src/agent/Watchdog/WatchdogMain.cpp

@@ -671,6 +671,7 @@ usage() {
 	printf("      --no-delete-pid-file    Do not delete PID file on exit\n");
 	printf("      --log-file PATH         Log to the given file.\n");
 	printf("      --log-level LEVEL       Logging level. [A] Default: %d\n", DEFAULT_LOG_LEVEL);
+	printf("      --disable-log-prefix    Disables prefixing application logs with App PID stdout\n");
 	printf("      --report-file PATH      Upon successful initialization, report instance\n");
 	printf("                              information to the given file, in JSON format\n");
 	printf("      --cleanup-pidfile PATH  Upon shutdown, kill the process specified by\n");
@@ -813,6 +814,9 @@ parseOptions(int argc, const char *argv[], ConfigKit::Store &config) {
 		} else if (p.isValueFlag(argc, i, argv[i], '\0', "--log-file")) {
 			updates["log_target"] = argv[i + 1];
 			i += 2;
+		} else if (p.isFlag(argv[i], '\0', "--disable-log-prefix")) {
+			updates["disable_log_prefix"] = true;
+			i++;
 		} else if (p.isValueFlag(argc, i, argv[i], '\0', "--ctl")) {
 			const char *value = strchr(argv[i + 1], '=');
 			if (value == NULL) {

data/src/apache2_module/ConfigGeneral/AutoGeneratedDefinitions.cpp

@@ -86,7 +86,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_anonymous_telemetry_proxy,
 		NULL,
 		RSRC_CONF,
-		"Use specified HTTP/SOCKS proxy for Phusion Passenger anonymous telemetry collection."),
+		"Use specified HTTP/SOCKS proxy for Phusion Passenger(R) anonymous telemetry collection."),
 	AP_INIT_TAKE1("PassengerAppEnv",
 		(Take1Func) cmd_passenger_app_env,
 		NULL,
@@ -141,17 +141,17 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take2Func) cmd_passenger_ctl,
 		NULL,
 		RSRC_CONF,
-		"Set advanced Phusion Passenger options."),
+		"Set advanced Phusion Passenger(R) options."),
 	AP_INIT_TAKE1("PassengerDataBufferDir",
 		(Take1Func) cmd_passenger_data_buffer_dir,
 		NULL,
 		RSRC_CONF,
-		"The directory that Phusion Passenger data buffers should be stored into."),
+		"The directory that Phusion Passenger(R) data buffers should be stored into."),
 	AP_INIT_TAKE1("PassengerDebugLogFile",
 		(Take1Func) cmd_passenger_log_file,
 		NULL,
 		RSRC_CONF,
-		"The Phusion Passenger log file."),
+		"The Phusion Passenger(R) log file."),
 	AP_INIT_FLAG("PassengerDebugger",
 		(FlagFunc) cmd_passenger_enterprise_only,
 		NULL,
@@ -161,17 +161,17 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_default_group,
 		NULL,
 		RSRC_CONF,
-		"The group that Phusion Passenger applications must run as when user switching fails or is disabled."),
+		"The group that Phusion Passenger(R) applications must run as when user switching fails or is disabled."),
 	AP_INIT_TAKE1("PassengerDefaultRuby",
 		(Take1Func) cmd_passenger_default_ruby,
 		NULL,
 		RSRC_CONF,
-		"Phusion Passenger's default Ruby interpreter to use."),
+		"Phusion Passenger(R)'s default Ruby interpreter to use."),
 	AP_INIT_TAKE1("PassengerDefaultUser",
 		(Take1Func) cmd_passenger_default_user,
 		NULL,
 		RSRC_CONF,
-		"The user that Phusion Passenger applications must run as when user switching fails or is disabled."),
+		"The user that Phusion Passenger(R) applications must run as when user switching fails or is disabled."),
 	AP_INIT_TAKE1("PassengerDirectInstanceRequestAddress",
 		(Take1Func) cmd_passenger_direct_instance_request_address,
 		NULL,
@@ -181,7 +181,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(FlagFunc) cmd_passenger_disable_anonymous_telemetry,
 		NULL,
 		RSRC_CONF,
-		"Whether to disable Phusion Passenger anonymous telemetry."),
+		"Whether to disable Phusion Passenger(R) anonymous telemetry."),
 	AP_INIT_FLAG("PassengerDisableLogPrefix",
 		(FlagFunc) cmd_passenger_disable_log_prefix,
 		NULL,
@@ -191,7 +191,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(FlagFunc) cmd_passenger_disable_security_update_check,
 		NULL,
 		RSRC_CONF,
-		"Whether to disable the Phusion Passenger security update check & notification."),
+		"Whether to disable the Phusion Passenger(R) security update check & notification."),
 	AP_INIT_TAKE1("PassengerDumpConfigManifest",
 		(Take1Func) cmd_passenger_dump_config_manifest,
 		NULL,
@@ -201,7 +201,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(FlagFunc) cmd_passenger_enabled,
 		NULL,
 		RSRC_CONF | ACCESS_CONF | OR_ALL,
-		"Enable or disable Phusion Passenger."),
+		"Enable or disable Phusion Passenger(R)."),
 	AP_INIT_FLAG("PassengerErrorOverride",
 		(FlagFunc) cmd_passenger_error_override,
 		NULL,
@@ -211,7 +211,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_file_descriptor_log_file,
 		NULL,
 		RSRC_CONF,
-		"The Phusion Passenger file descriptor log file."),
+		"The Phusion Passenger(R) file descriptor log file."),
 	AP_INIT_TAKE1("PassengerFlyWith",
 		(Take1Func) cmd_passenger_enterprise_only,
 		NULL,
@@ -241,7 +241,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_instance_registry_dir,
 		NULL,
 		RSRC_CONF,
-		"The directory to register the Phusion Passenger instance to."),
+		"The directory to register the Phusion Passenger(R) instance to."),
 	AP_INIT_FLAG("PassengerLoadShellEnvvars",
 		(FlagFunc) cmd_passenger_load_shell_envvars,
 		NULL,
@@ -251,12 +251,12 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_log_file,
 		NULL,
 		RSRC_CONF,
-		"The Phusion Passenger log file."),
+		"The Phusion Passenger(R) log file."),
 	AP_INIT_TAKE1("PassengerLogLevel",
 		(Take1Func) cmd_passenger_log_level,
 		NULL,
 		RSRC_CONF,
-		"The Phusion Passenger log verbosity."),
+		"The Phusion Passenger(R) log verbosity."),
 	AP_INIT_TAKE1("PassengerLveMinUid",
 		(Take1Func) cmd_passenger_lve_min_uid,
 		NULL,
@@ -266,7 +266,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_enterprise_only,
 		NULL,
 		RSRC_CONF | ACCESS_CONF,
-		"The maximum number of instances for the current application that Phusion Passenger may spawn."),
+		"The maximum number of instances for the current application that Phusion Passenger(R) may spawn."),
 	AP_INIT_TAKE1("PassengerMaxInstancesPerApp",
 		(Take1Func) cmd_passenger_max_instances_per_app,
 		NULL,
@@ -337,6 +337,11 @@ extern "C" const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"Prestart the given web applications during startup."),
+	AP_INIT_FLAG("PassengerPreloadBundler",
+		(FlagFunc) cmd_passenger_preload_bundler,
+		NULL,
+		RSRC_CONF | ACCESS_CONF,
+		"Whether to tell Ruby to load the bundler gem before running the application."),
 	AP_INIT_TAKE1("PassengerPython",
 		(Take1Func) cmd_passenger_python,
 		NULL,
@@ -351,12 +356,12 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_response_buffer_high_watermark,
 		NULL,
 		RSRC_CONF,
-		"The maximum size of the Phusion Passenger response buffer."),
+		"The maximum size of the Phusion Passenger(R) response buffer."),
 	AP_INIT_TAKE1("PassengerRestartDir",
 		(Take1Func) cmd_passenger_restart_dir,
 		NULL,
 		RSRC_CONF | ACCESS_CONF,
-		"The directory in which Phusion Passenger should look for restart.txt."),
+		"The directory in which Phusion Passenger(R) should look for restart.txt."),
 	AP_INIT_FLAG("PassengerRollingRestarts",
 		(FlagFunc) cmd_passenger_enterprise_only,
 		NULL,
@@ -366,7 +371,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_root,
 		NULL,
 		RSRC_CONF,
-		"The Phusion Passenger root folder."),
+		"The Phusion Passenger(R) root folder."),
 	AP_INIT_TAKE1("PassengerRuby",
 		(Take1Func) cmd_passenger_ruby,
 		NULL,
@@ -376,22 +381,22 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_security_update_check_proxy,
 		NULL,
 		RSRC_CONF,
-		"Use specified HTTP/SOCKS proxy for the Phusion Passenger security update check."),
+		"Use specified HTTP/SOCKS proxy for the Phusion Passenger(R) security update check."),
 	AP_INIT_FLAG("PassengerShowVersionInHeader",
 		(FlagFunc) cmd_passenger_show_version_in_header,
 		NULL,
 		RSRC_CONF,
-		"Whether to show the Phusion Passenger version number in the X-Powered-By header."),
+		"Whether to show the Phusion Passenger(R) version number in the X-Powered-By header."),
 	AP_INIT_TAKE1("PassengerSocketBacklog",
 		(Take1Func) cmd_passenger_socket_backlog,
 		NULL,
 		RSRC_CONF,
-		"The Phusion Passenger socket backlog."),
+		"The Phusion Passenger(R) socket backlog."),
 	AP_INIT_TAKE1("PassengerSpawnDir",
 		(Take1Func) cmd_passenger_spawn_dir,
 		NULL,
 		RSRC_CONF,
-		"The directory for Phusion Passenger used during child spawning."),
+		"The directory for Phusion Passenger(R) used during child spawning."),
 	AP_INIT_TAKE1("PassengerSpawnMethod",
 		(Take1Func) cmd_passenger_spawn_method,
 		NULL,
@@ -431,12 +436,12 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_enterprise_only,
 		NULL,
 		RSRC_CONF | ACCESS_CONF,
-		"The number of threads that Phusion Passenger should spawn per application."),
+		"The number of threads that Phusion Passenger(R) should spawn per application."),
 	AP_INIT_FLAG("PassengerTurbocaching",
 		(FlagFunc) cmd_passenger_turbocaching,
 		NULL,
 		RSRC_CONF,
-		"Whether to enable turbocaching in Phusion Passenger."),
+		"Whether to enable turbocaching in Phusion Passenger(R)."),
 	AP_INIT_FLAG("PassengerUseGlobalQueue",
 		(FlagFunc) cmd_passenger_use_global_queue,
 		NULL,
@@ -451,7 +456,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(FlagFunc) cmd_passenger_user_switching,
 		NULL,
 		RSRC_CONF,
-		"Whether to enable user switching support in Phusion Passenger."),
+		"Whether to enable user switching support in Phusion Passenger(R)."),
 	AP_INIT_TAKE1("RackBaseURI",
 		(Take1Func) cmd_passenger_base_uri,
 		NULL,
@@ -481,7 +486,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_default_user,
 		NULL,
 		RSRC_CONF,
-		"The user that Phusion Passenger applications must run as when user switching fails or is disabled."),
+		"The user that Phusion Passenger(R) applications must run as when user switching fails or is disabled."),
 	AP_INIT_TAKE1("RailsEnv",
 		(Take1Func) cmd_passenger_app_env,
 		NULL,
@@ -526,7 +531,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(FlagFunc) cmd_passenger_user_switching,
 		NULL,
 		RSRC_CONF,
-		"Whether to enable user switching support in Phusion Passenger."),
+		"Whether to enable user switching support in Phusion Passenger(R)."),
 	AP_INIT_TAKE1("UnionStationFilter",
 		(Take1Func) cmd_union_station_filter,
 		NULL,