passenger 6.0.11 → 6.0.14

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.11")
+ *   server_software                                     string             -          default("Phusion_Passenger/6.0.14")
  *   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/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/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/SpawnEnvSetupper/SpawnEnvSetupperMain.cpp

@@ -702,6 +702,10 @@ 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()) {
+		setenv("RUBYOPT", "-r bundler/setup", 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);

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.11")
+ *   server_software                                                          string             -          default("Phusion_Passenger/6.0.14")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only

data/src/apache2_module/ConfigGeneral/AutoGeneratedDefinitions.cpp

@@ -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,

data/src/apache2_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.cpp

@@ -234,6 +234,11 @@ ConfigManifestGenerator::autoGenerated_setAppConfigDefaults() {
 		"PassengerNodejs",
 		DEFAULT_NODEJS);
 
+	addOptionsContainerStaticDefaultBool(
+		defaultAppConfigContainer,
+		"PassengerPreloadBundler",
+		false);
+
 	addOptionsContainerStaticDefaultStr(
 		defaultAppConfigContainer,
 		"PassengerPython",

data/src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp

@@ -729,6 +729,24 @@ cmd_passenger_pre_start(cmd_parms *cmd, void *pcfg, const char *arg) {
 	return NULL;
 }
 
+static const char *
+cmd_passenger_preload_bundler(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->mPreloadBundlerSourceFile = cmd->directive->filename;
+	config->mPreloadBundlerSourceLine = cmd->directive->line_num;
+	config->mPreloadBundlerExplicitlySet = true;
+	config->mPreloadBundler =
+		(arg != NULL) ?
+		ENABLED :
+		DISABLED;
+	return NULL;
+}
+
 static const char *
 cmd_passenger_python(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

@@ -101,6 +101,7 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	/*
 	 * config->mNodejs: default initialized
 	 */
+	config->mPreloadBundler = Apache2Module::UNSET;
 	/*
 	 * config->mPython: default initialized
 	 */
@@ -154,6 +155,7 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	config->mMinInstancesSourceLine = 0;
 	config->mMonitorLogFileSourceLine = 0;
 	config->mNodejsSourceLine = 0;
+	config->mPreloadBundlerSourceLine = 0;
 	config->mPythonSourceLine = 0;
 	config->mRestartDirSourceLine = 0;
 	config->mRubySourceLine = 0;
@@ -191,6 +193,7 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	config->mMinInstancesExplicitlySet = false;
 	config->mMonitorLogFileExplicitlySet = false;
 	config->mNodejsExplicitlySet = false;
+	config->mPreloadBundlerExplicitlySet = false;
 	config->mPythonExplicitlySet = false;
 	config->mRestartDirExplicitlySet = false;
 	config->mRubyExplicitlySet = false;

data/src/apache2_module/DirConfig/AutoGeneratedHeaderSerialization.cpp

@@ -97,6 +97,9 @@ constructRequestHeaders_autoGenerated(request_rec *r, DirConfig *config, std::st
 	addHeader(result, StaticString("!~PASSENGER_NODEJS",
 			sizeof("!~PASSENGER_NODEJS") - 1),
 		config->mNodejs);
+	addHeader(result, StaticString("!~PASSENGER_PRELOAD_BUNDLER",
+			sizeof("!~PASSENGER_PRELOAD_BUNDLER") - 1),
+		config->mPreloadBundler);
 	addHeader(result, StaticString("!~PASSENGER_PYTHON",
 			sizeof("!~PASSENGER_PYTHON") - 1),
 		config->mPython);

data/src/apache2_module/DirConfig/AutoGeneratedManifestGeneration.cpp

@@ -361,6 +361,17 @@ ConfigManifestGenerator::autoGenerated_generateConfigManifestForDirConfig(server
 			pdconf->mNodejs.data(),
 			pdconf->mNodejs.data() + pdconf->mNodejs.size());
 	}
+	if (pdconf->mPreloadBundlerExplicitlySet) {
+		findOrCreateAppAndLocOptionsContainers(serverRec, csconf, cdconf,
+			pdconf, context, &appOptionsContainer, &locOptionsContainer);
+		Json::Value &optionContainer = findOrCreateOptionContainer(*appOptionsContainer,
+			"PassengerPreloadBundler",
+			sizeof("PassengerPreloadBundler") - 1);
+		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
+			pdconf->mPreloadBundlerSourceFile,
+			pdconf->mPreloadBundlerSourceLine);
+		hierarchyMember["value"] = pdconf->mPreloadBundler == Apache2Module::ENABLED;
+	}
 	if (pdconf->mPythonExplicitlySet) {
 		findOrCreateAppAndLocOptionsContainers(serverRec, csconf, cdconf,
 			pdconf, context, &appOptionsContainer, &locOptionsContainer);

data/src/apache2_module/DirConfig/AutoGeneratedMergeFunction.cpp

@@ -152,6 +152,10 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 		(!add->mNodejs.empty())
 		? add->mNodejs
 		: base->mNodejs;
+	config->mPreloadBundler =
+		(add->mPreloadBundler != Apache2Module::UNSET)
+		? add->mPreloadBundler
+		: base->mPreloadBundler;
 	config->mPython =
 		(!add->mPython.empty())
 		? add->mPython
@@ -219,6 +223,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mMinInstancesSourceFile = add->mMinInstancesSourceFile;
 	config->mMonitorLogFileSourceFile = add->mMonitorLogFileSourceFile;
 	config->mNodejsSourceFile = add->mNodejsSourceFile;
+	config->mPreloadBundlerSourceFile = add->mPreloadBundlerSourceFile;
 	config->mPythonSourceFile = add->mPythonSourceFile;
 	config->mRestartDirSourceFile = add->mRestartDirSourceFile;
 	config->mRubySourceFile = add->mRubySourceFile;
@@ -256,6 +261,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mMinInstancesSourceLine = add->mMinInstancesSourceLine;
 	config->mMonitorLogFileSourceLine = add->mMonitorLogFileSourceLine;
 	config->mNodejsSourceLine = add->mNodejsSourceLine;
+	config->mPreloadBundlerSourceLine = add->mPreloadBundlerSourceLine;
 	config->mPythonSourceLine = add->mPythonSourceLine;
 	config->mRestartDirSourceLine = add->mRestartDirSourceLine;
 	config->mRubySourceLine = add->mRubySourceLine;
@@ -293,6 +299,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mMinInstancesExplicitlySet = add->mMinInstancesExplicitlySet;
 	config->mMonitorLogFileExplicitlySet = add->mMonitorLogFileExplicitlySet;
 	config->mNodejsExplicitlySet = add->mNodejsExplicitlySet;
+	config->mPreloadBundlerExplicitlySet = add->mPreloadBundlerExplicitlySet;
 	config->mPythonExplicitlySet = add->mPythonExplicitlySet;
 	config->mRestartDirExplicitlySet = add->mRestartDirExplicitlySet;
 	config->mRubyExplicitlySet = add->mRubyExplicitlySet;

data/src/apache2_module/DirConfig/AutoGeneratedStruct.h

@@ -96,6 +96,11 @@ struct AutoGeneratedDirConfig {
 	 */
 	Threeway mLoadShellEnvvars;
 
+	/*
+	 * Whether to tell Ruby to load the bundler gem before running the application.
+	 */
+	Threeway mPreloadBundler;
+
 	/*
 	 * Whether to enable sticky sessions.
 	 */
@@ -245,6 +250,7 @@ struct AutoGeneratedDirConfig {
 	StaticString mFriendlyErrorPagesSourceFile;
 	StaticString mHighPerformanceSourceFile;
 	StaticString mLoadShellEnvvarsSourceFile;
+	StaticString mPreloadBundlerSourceFile;
 	StaticString mStickySessionsSourceFile;
 	StaticString mForceMaxConcurrentRequestsPerProcessSourceFile;
 	StaticString mLveMinUidSourceFile;
@@ -282,6 +288,7 @@ struct AutoGeneratedDirConfig {
 	unsigned int mFriendlyErrorPagesSourceLine;
 	unsigned int mHighPerformanceSourceLine;
 	unsigned int mLoadShellEnvvarsSourceLine;
+	unsigned int mPreloadBundlerSourceLine;
 	unsigned int mStickySessionsSourceLine;
 	unsigned int mForceMaxConcurrentRequestsPerProcessSourceLine;
 	unsigned int mLveMinUidSourceLine;
@@ -319,6 +326,7 @@ struct AutoGeneratedDirConfig {
 	bool mFriendlyErrorPagesExplicitlySet: 1;
 	bool mHighPerformanceExplicitlySet: 1;
 	bool mLoadShellEnvvarsExplicitlySet: 1;
+	bool mPreloadBundlerExplicitlySet: 1;
 	bool mStickySessionsExplicitlySet: 1;
 	bool mForceMaxConcurrentRequestsPerProcessExplicitlySet: 1;
 	bool mLveMinUidExplicitlySet: 1;
@@ -417,6 +425,15 @@ struct AutoGeneratedDirConfig {
 		}
 	}
 
+	bool
+	getPreloadBundler() const {
+		if (mPreloadBundler == Apache2Module::UNSET) {
+			return false;
+		} else {
+			return mPreloadBundler == Apache2Module::ENABLED;
+		}
+	}
+
 	bool
 	getStickySessions() const {
 		if (mStickySessions == Apache2Module::UNSET) {

data/src/apache2_module/Hooks.cpp

@@ -1333,6 +1333,7 @@ public:
 		config["server_software"] = webServerDesc;
 		config["multi_app"] = true;
 		config["default_load_shell_envvars"] = true;
+		config["default_preload_bundler"] = false;
 		config["config_manifest"] = serverConfig.manifest;
 		config["file_descriptor_log_target"] = nonEmptyString(serverConfig.fileDescriptorLogFile);
 		config["controller_socket_backlog"] = serverConfig.socketBacklog;

data/src/cxx_supportlib/Constants.h

@@ -83,7 +83,7 @@
 #define PASSENGER_API_VERSION_MAJOR 0
 #define PASSENGER_API_VERSION_MINOR 3
 #define PASSENGER_DEFAULT_USER "nobody"
-#define PASSENGER_VERSION "6.0.11"
+#define PASSENGER_VERSION "6.0.14"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"

data/src/cxx_supportlib/IOTools/IOUtils.cpp

@@ -1183,7 +1183,7 @@ readFileDescriptor(int fd, unsigned long long *timeout) {
 	struct msghdr msg;
 	struct iovec vec;
 	char dummy[1];
-	#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
+	#if defined(__APPLE__) || defined(__SOLARIS__)
 		// File descriptor passing macros (CMSG_*) seem to be broken
 		// on 64-bit MacOS X. This structure works around the problem.
 		struct {
@@ -1226,7 +1226,7 @@ readFileDescriptor(int fd, unsigned long long *timeout) {
 		throw IOException("No valid file descriptor received.");
 	}
 
-	#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
+	#if defined(__APPLE__) || defined(__SOLARIS__)
 		return control_data.fd;
 	#else
 		return *((int *) CMSG_DATA(control_header));
@@ -1242,7 +1242,7 @@ writeFileDescriptor(int fd, int fdToSend, unsigned long long *timeout) {
 	struct msghdr msg;
 	struct iovec vec;
 	char dummy[1];
-	#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
+	#if defined(__APPLE__) || defined(__SOLARIS__)
 		struct {
 			struct cmsghdr header;
 			int fd;
@@ -1273,7 +1273,7 @@ writeFileDescriptor(int fd, int fdToSend, unsigned long long *timeout) {
 	control_header = CMSG_FIRSTHDR(&msg);
 	control_header->cmsg_level = SOL_SOCKET;
 	control_header->cmsg_type  = SCM_RIGHTS;
-	#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
+	#if defined(__APPLE__) || defined(__SOLARIS__)
 		control_header->cmsg_len = sizeof(control_data);
 		control_data.fd = fdToSend;
 	#else

data/src/cxx_supportlib/vendor-modified/boost/align/align.hpp

@@ -0,0 +1,19 @@
+/*
+Copyright 2014-2015 Glen Joseph Fernandes
+(glenjofe@gmail.com)
+
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
+*/
+#ifndef BOOST_ALIGN_ALIGN_HPP
+#define BOOST_ALIGN_ALIGN_HPP
+
+#include <boost/config.hpp>
+
+#if !defined(BOOST_NO_CXX11_STD_ALIGN) && !defined(BOOST_LIBSTDCXX_VERSION)
+#include <boost/align/detail/align_cxx11.hpp>
+#else
+#include <boost/align/detail/align.hpp>
+#endif
+
+#endif

data/src/cxx_supportlib/vendor-modified/boost/align/aligned_alloc.hpp

@@ -0,0 +1,47 @@
+/*
+Copyright 2014-2015 Glen Joseph Fernandes
+(glenjofe@gmail.com)
+
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
+*/
+#ifndef BOOST_ALIGN_ALIGNED_ALLOC_HPP
+#define BOOST_ALIGN_ALIGNED_ALLOC_HPP
+
+#include <boost/config.hpp>
+
+#if defined(BOOST_HAS_UNISTD_H)
+#include <unistd.h>
+#endif
+
+#if defined(__APPLE__) || defined(__APPLE_CC__) || defined(macintosh)
+#include <AvailabilityMacros.h>
+#endif
+
+#if defined(BOOST_ALIGN_USE_ALIGN)
+#include <boost/align/detail/aligned_alloc.hpp>
+#elif defined(BOOST_ALIGN_USE_NEW)
+#include <boost/align/detail/aligned_alloc_new.hpp>
+#elif defined(_MSC_VER) && !defined(UNDER_CE)
+#include <boost/align/detail/aligned_alloc_msvc.hpp>
+#elif defined(__MINGW32__) && (__MSVCRT_VERSION__ >= 0x0700)
+#include <boost/align/detail/aligned_alloc_msvc.hpp>
+#elif defined(__MINGW32__)
+#include <boost/align/detail/aligned_alloc_mingw.hpp>
+#elif MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#include <boost/align/detail/aligned_alloc_posix.hpp>
+#elif MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+#include <boost/align/detail/aligned_alloc_macos.hpp>
+#elif defined(__ANDROID__)
+#include <boost/align/detail/aligned_alloc_android.hpp>
+#elif defined(__SunOS_5_11) || defined(__SunOS_5_12)
+#include <boost/align/detail/aligned_alloc_posix.hpp>
+#elif defined(sun) || defined(__sun)
+#include <boost/align/detail/aligned_alloc_sunos.hpp>
+#elif (_POSIX_C_SOURCE >= 200112L) || (_XOPEN_SOURCE >= 600)
+#include <boost/align/detail/aligned_alloc_posix.hpp>
+#else
+#include <boost/align/detail/aligned_alloc.hpp>
+#endif
+
+#endif

data/src/cxx_supportlib/vendor-modified/boost/align/alignment_of.hpp

@@ -0,0 +1,54 @@
+/*
+Copyright 2014-2016 Glen Joseph Fernandes
+(glenjofe@gmail.com)
+
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
+*/
+#ifndef BOOST_ALIGN_ALIGNMENT_OF_HPP
+#define BOOST_ALIGN_ALIGNMENT_OF_HPP
+
+#include <boost/align/detail/element_type.hpp>
+#include <boost/align/alignment_of_forward.hpp>
+
+#if defined(_MSC_VER) && defined(__clang__)
+#include <boost/align/detail/alignment_of_cxx11.hpp>
+#elif defined(BOOST_MSVC)
+#include <boost/align/detail/alignment_of_msvc.hpp>
+#elif defined(__GNUC__) && defined(__unix__) && !defined(__LP64__)
+#include <boost/align/detail/alignment_of.hpp>
+#elif defined(BOOST_CLANG) && !defined(__x86_64__)
+#include <boost/align/detail/alignment_of.hpp>
+#elif !defined(BOOST_NO_CXX11_HDR_TYPE_TRAITS)
+#include <boost/align/detail/alignment_of_cxx11.hpp>
+#elif defined(__ghs__) && (__GHS_VERSION_NUMBER >= 600)
+#include <boost/align/detail/alignment_of_gcc.hpp>
+#elif defined(BOOST_CODEGEARC)
+#include <boost/align/detail/alignment_of_codegear.hpp>
+#elif defined(BOOST_CLANG)
+#include <boost/align/detail/alignment_of_clang.hpp>
+#elif __GNUC__ > 4
+#include <boost/align/detail/alignment_of_gcc.hpp>
+#elif (__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)
+#include <boost/align/detail/alignment_of_gcc.hpp>
+#else
+#include <boost/align/detail/alignment_of.hpp>
+#endif
+
+namespace boost {
+namespace alignment {
+
+template<class T>
+struct alignment_of
+    : detail::alignment_of<typename
+        detail::element_type<T>::type>::type { };
+
+#if !defined(BOOST_NO_CXX14_VARIABLE_TEMPLATES)
+template<class T>
+constexpr std::size_t alignment_of_v = alignment_of<T>::value;
+#endif
+
+} /* alignment */
+} /* boost */
+
+#endif