passenger 6.0.12 → 6.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 536d56479491f031585ad9f7a050a49978a965be
-  data.tar.gz: 2074da45c50faf1754c190f448c8fd89bd1e0bfe
+  metadata.gz: 24a18af9e7b3ec92ce88aa64fd7d62242691972a
+  data.tar.gz: b3b72d0daa134635ea11f3cab5745f7a491dd102
 SHA512:
-  metadata.gz: a9c3b77e7ccf78b9018135ac0501a864c3bb2f695df9c5d3aa8510aa75fc04440ed4aaf6c9db3876fa8512965436ac5e3959dadb0905f4ca375f5830dd8c0091
-  data.tar.gz: 5e64ae1f36a459ab8661849c2c48af6fabe5a91ccb88485ecde138323686393557dde2399bfee4c2aa45e121e5cf12bb9c6f59b09e774d393b20db7803b8411c
+  metadata.gz: 42bd44f99c71b20f121f91197ae7e407993fef8a15935659907f98399d10deb5c97dac9acb8f9cb253cb42b1304a140769a67c08a22e7f9fe1cda5e9cb06e3f0
+  data.tar.gz: 923ab59ac46d2d6f96f265fa79628a8f68186c2e8055bbb451cbcf9f593f5f58cb1cfaf1c4aef8950a8356a8c2b95a0821f957211ca5d003b262e33b1c813453

data/CHANGELOG

@@ -1,4 +1,40 @@
-Release 6.0.12 (Not yet released)
+Release 6.0.13 (Not yet released)
+-------------
+ * Add WASM mime type, Closes GH-2398.
+ * Fix compilation on FreeBSD 13. Closes GH-2402.
+ * [Ruby] Fixes app process crash when ECONNRESET received.
+ * Fix automated fetching of pcre source for installer scripts.
+ * Bump preferred nginx 1.20.1 → 1.20.2.
+ * [Ruby] Add option to preload bundler. Closes GH-2409.
+
+   - Apache: PassengerPreloadBundler
+   - Nginx: passenger_preload_bundler
+   - Standalone: --preload_bundler
+
+ * [Node] Suppresses the winston circular dependency warning.
+ * [RPMs] EL8 RPMs are now built on Rocky linux, and should be compatible with Alma, Rocky, CentOS, and RHEL.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+   - ccache 4.4.2 → 4.6
+   - cmake 3.21.4 → 3.22.3
+   - curl 7.79.1 → 7.82.0
+   - git 2.33.1 → 2.35.1
+   - gnupg 2.3.3 → 2.3.4
+   - libgpg_error 1.42 → 1.44
+   - ntbtls 0.2.0 → 0.3.0
+   - openssl 1.1.1l → 1.1.1n
+   - rubygems 3.2.30 → 3.3.9
+   - zstd 1.5.0 → 1.5.2
+   - ruby
+     - dropped 2.4.10
+     - dropped 2.5.9
+     - 2.6.8 → 2.6.9
+     - 2.7.4 → 2.7.5
+     - 3.0.2 → 3.0.3
+     - added 3.1.1
+
+
+Release 6.0.12
 -------------
  * [Debian] Fix compilation on 32 bit arm. Contributed by Antonio Terceiro.
  * [Debian] Add Bullseye Debian packages.

data/bin/passenger-install-nginx-module

@@ -268,7 +268,7 @@ private
     new_screen
     puts "<banner>PCRE (required by Nginx) not installed, downloading it...</banner>"
 
-    url = "https://ftp.pcre.org/pub/pcre/pcre-#{PREFERRED_PCRE_VERSION}.tar.gz"
+    url = "https://sourceforge.net/projects/pcre/files/pcre/#{PREFERRED_PCRE_VERSION}/pcre-#{PREFERRED_PCRE_VERSION}.tar.gz/download"
     dirname = "pcre-#{PREFERRED_PCRE_VERSION}"
     tarball = "#{@working_dir}/pcre.tar.gz"
 

data/dev/copy_boost_headers

@@ -102,16 +102,31 @@ PROGRAM_SOURCE = %q{
   #include <boost/date_time/posix_time/posix_time.hpp>
   #include <boost/foreach.hpp>
   #include <boost/unordered_map.hpp>
-  #include <boost/cregex.hpp>
   #include <boost/regex.hpp>
   #include <boost/pool/object_pool.hpp>
   #include <boost/move/core.hpp>
   #include <boost/move/utility.hpp>
   #include <boost/atomic.hpp>
   #include <boost/typeof/typeof.hpp>
-  #include <boost/asio.hpp>
-  #include <boost/pointer_cast.hpp>
   #include <boost/circular_buffer.hpp>
+  #include <boost/config.hpp>
+  #include <boost/container/small_vector.hpp>
+  #include <boost/core/noncopyable.hpp>
+  #include <boost/cstdint.hpp>
+  #include <boost/current_function.hpp>
+  #include <boost/date_time/posix_time/posix_time_types.hpp>
+  #include <boost/move/move.hpp>
+  #include <boost/predef.h>
+  #include <boost/ref.hpp>
+  #include <boost/scoped_array.hpp>
+  #include <boost/scoped_ptr.hpp>
+  #include <boost/static_assert.hpp>
+  #include <boost/thread/mutex.hpp>
+  #include <boost/thread/tss.hpp>
+// Included despite not used in Passenger
+  #include <boost/cregex.hpp>
+  #include <boost/pointer_cast.hpp>
+  #include <boost/asio.hpp>
 }
 
 require 'fileutils'
@@ -189,19 +204,19 @@ end
 def copy_dependencies(cflags)
   done = false
   while !done
-    compiler_output = `c++ test.cpp -c -I. -I.. #{cflags} 2>&1`
+    compiler_output = `c++ test.cpp -c -I. -I.. #{cflags.join(" ")} 2>&1`
     File.unlink('test.o') if File.exist?('test.o')
     missing_headers = compiler_output.
-      split("\n").
-      grep(/(error: .*: No such file|fatal error: '.*' file not found)/).
-      map do |line|
-        if line =~ /error: (.*): No such file/
-          file = $1
-        elsif line =~ /fatal error: '(.*)' file not found/
-          file = $1
-        else
-          abort "Bug"
-        end
+                        split("\n").
+                        grep(/(error: .*: No such file|fatal error: '.*' file not found)/).
+                        map do |line|
+      if line =~ /error: (.*): No such file/
+        file = $1
+      elsif line =~ /fatal error: '(.*)' file not found/
+        file = $1
+      else
+        abort "Bug"
+      end
       if file =~ /^boost\//
         file
       else
@@ -246,7 +261,7 @@ def start
       "-std=c++0x",
       "-std=gnu++0x",
       ""
-    ].each do |flags|
+    ].product(["-m32","-m64",""]).each do |flags|
       copy_dependencies(flags)
     end
   ensure

data/resources/mime.types

@@ -6,6 +6,7 @@ types {
     image/gif                             gif;
     image/jpeg                            jpeg jpg;
     application/x-javascript              js;
+    application/wasm                      wasm;
     application/atom+xml                  atom;
     application/rss+xml                   rss;
     text/cache-manifest                   manifest appcache;

data/resources/templates/standalone/server.erb

@@ -52,6 +52,7 @@ passenger_enabled on;
 <%= nginx_option(app, :vary_turbocache_by_cookie) %>
 <%= nginx_option(app, :meteor_app_settings) %>
 <%= nginx_option(app, :load_shell_envvars) %>
+<%= nginx_option(app, :preload_bundler) %>
 <%= nginx_option(app, :app_file_descriptor_ulimit) %>
 <%= nginx_option(app, :friendly_error_pages) %>
 <%= nginx_option(app, :abort_websockets_on_process_shutdown) %>

data/src/agent/Core/ApplicationPool/Group/StateInspection.cpp

@@ -255,6 +255,7 @@ Group::inspectConfigInAdminPanelFormat(Json::Value &result) const {
 	result["user_switching"] = VAL(options.userSwitching); // TODO: default value depends on integration mode and euid
 	result["file_descriptor_ulimit"] = VAL(options.fileDescriptorUlimit, 0u);
 	result["load_shell_envvars"] = VAL(options.loadShellEnvvars); // TODO: default value depends on integration mode
+	result["preload_bundler"] = VAL(options.preloadBundler);
 	result["max_request_queue_size"] = VAL(options.maxRequestQueueSize,
 		(Json::UInt) DEFAULT_MAX_REQUEST_QUEUE_SIZE);
 	result["max_requests"] = VAL((Json::UInt) options.maxRequests, 0u);

data/src/agent/Core/ApplicationPool/Options.h

@@ -312,6 +312,10 @@ public:
 	 */
 	bool loadShellEnvvars;
 
+	/** Whether to tell Ruby to load bundler during spawning.
+	 */
+	bool preloadBundler;
+
 	bool userSwitching;
 
 	/**
@@ -460,6 +464,7 @@ public:
 		  forceMaxConcurrentRequestsPerProcess(-1),
 		  debugger(false),
 		  loadShellEnvvars(true),
+		  preloadBundler(false),
 		  userSwitching(true),
 		  raiseInternalError(false),
 

data/src/agent/Core/Config.h

@@ -164,7 +164,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.12")
+ *   server_software                                                 string             -          default("Phusion_Passenger/6.0.13")
  *   show_version_in_header                                          boolean            -          default(true)
  *   single_app_mode_app_root                                        string             -          default,read_only
  *   single_app_mode_app_start_command                               string             -          read_only

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

@@ -115,7 +115,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.12")
+ *   server_software                                     string             -          default("Phusion_Passenger/6.0.13")
  *   show_version_in_header                              boolean            -          default(true)
  *   start_reading_after_accept                          boolean            -          default(true)
  *   stat_throttle_rate                                  unsigned integer   -          default(10)
@@ -165,6 +165,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 +441,7 @@ public:
 	bool showVersionInHeader: 1;
 	bool defaultAbortWebsocketsOnProcessShutdown;
 	bool defaultLoadShellEnvvars;
+	bool defaultPreloadBundler;
 
 	/*******************/
 	/*******************/
@@ -473,7 +475,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/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

@@ -153,7 +153,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.12")
+ *   server_software                                                          string             -          default("Phusion_Passenger/6.0.13")
  *   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.12"
+#define PASSENGER_VERSION "6.0.13"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"

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