passenger 6.0.10 → 6.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84d5efa4e63f666d5f40342ef5e6992487b603f1
-  data.tar.gz: 5320cb6043d4574259be0e68ea82e6809d52c16d
+  metadata.gz: 24a18af9e7b3ec92ce88aa64fd7d62242691972a
+  data.tar.gz: b3b72d0daa134635ea11f3cab5745f7a491dd102
 SHA512:
-  metadata.gz: 1184227fb4ca333138b4ba0227d4cebec220ad677603b4a4f5d7b57c49c722bd618e3015b23ab9e2a28d122fffab1cbdb4dc42440a7c837a544450d5b7e324d2
-  data.tar.gz: 4b4145b3abb36b27a9cedcd58c35077cc63b4bc0576e028f8a5bc07052157973f6bd6ed67ff3b08bd3e3aad6cd22c7f01849b5a2cc7dc979dad5eec8fc167537
+  metadata.gz: 42bd44f99c71b20f121f91197ae7e407993fef8a15935659907f98399d10deb5c97dac9acb8f9cb253cb42b1304a140769a67c08a22e7f9fe1cda5e9cb06e3f0
+  data.tar.gz: 923ab59ac46d2d6f96f265fa79628a8f68186c2e8055bbb451cbcf9f593f5f58cb1cfaf1c4aef8950a8356a8c2b95a0821f957211ca5d003b262e33b1c813453

data/CHANGELOG

@@ -1,4 +1,86 @@
-Release 6.0.10 (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.
+ * Add formatted error messages to responses. Contributed by Mohammad Aboelnour.
+ * Fixes for running under WSL 1. Contributed by Luke Pearce. Closes GH-2036.
+ * Upgrades Boost to 1.77. To go along with 32 bit arm fix.
+ * [MacOS] Fixes autodetection of openssl lib on apple silicon. Contributed by Taketo Takashima. Closes GH-2389.
+ * Reconnect to mongoid databases after fork, like we do for ActiveRecord. Contributed by Mohammad Aboelnour.
+ * [Ubuntu] add missing apache name in instance registry dir detection.
+ * [Ubuntu] replace hirsute apt packages with impish.
+ * [Nginx] add new config option to choose the status code returned when application spawning fails. (passenger_spawn_exception_status_code).
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+ - ccache: 4.4.1 → 4.4.2
+ - cmake: 3.21.2 → 3.21.4
+ - curl: 7.78.0 → 7.79.1
+ - git: 2.33.0 → 2.33.1
+ - gnupg: 2.3.2 → 2.3.3
+ - rubygems: 3.2.27 → 3.2.30
+ - s3cmd: 2.1.0 → 2.2.0
+
+
+Release 6.0.11
+-------------
+ * Fix compilation on GCC 4.4, fixes a regression in 6.0.8 where Passenger would no longer compiler without a C++11 compiler.
+ * [CentOS] Fix version detection on CentOS Stream. Contributed by Taketo Takashima. Closes GH-2377.
+ * [MacOS] Additionally look for PCRE in the new location that Homebrew has split it's packages into.
+ * Fix compilation on GCC < 4.5.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+    - ccache: 4.3 → 4.4.1
+    - cmake: 3.20.5 → 3.21.2
+    - curl: 7.77.0 → 7.78.0
+    - git: 2.32.0 → 2.33.0
+    - gnupg: 2.3.1 → 2.3.2
+    - libgcrypt: 1.9.3 → 1.9.4
+    - openssl: 1.1.1k → 1.1.1l
+    - pinentry: 1.1.1 → 1.2.0
+    - rubygems: 3.2.21 → 3.2.27
+    - rubies:
+      - 2.6.7 → 2.6.8
+      - 2.7.3 → 2.7.4
+      - 3.0.1 → 3.0.2
+
+
+Release 6.0.10
 -------------
  * [Debian/Ubuntu] Fix a regression in `passenger_system_ruby` where Ruby 3 couldn't be found.
  * [CentOS/RHEL] Bump rpm nginx dependency to match EPEL nginx (was 1.16.1 now 1.20.1). Closes GH-2364.
@@ -11,6 +93,7 @@ Release 6.0.10 (Not yet released)
     - rubygems 3.2.19 → 3.2.21
     - pcre 8.44 → 8.45
 
+
 Release 6.0.9
 -------------
  * Upgrades Boost to 1.76. Fixes a regression where some boost headers for comatibility with older distros were missing.

data/CONTRIBUTORS

@@ -9,6 +9,7 @@ Andre Ferraz
 Andre Nathan
 Andrei Belov
 Andy Allan
+Antonio Terceiro
 Benjamin Fleischer
 Bernd Ahlers
 Bernhard M. Wiedemann
@@ -64,6 +65,7 @@ Joshua Lund
 jpatterson
 Jude Nagurney
 Kenneth Powers
+Luke Pearce
 Luuk Hafkamp (Phusion)
 Luuk Hendriks (Phusion)
 MAEDA Go
@@ -74,6 +76,7 @@ Michal Papis
 Michał Pokrywka
 Mike
 Mike Boone
+Mohammad Aboelnour
 Morton Jonuschat
 Nathaniel Bibler
 Neil Wilson
@@ -110,6 +113,7 @@ Sebastian Welther
 Slippy Douglas
 Stephen Bannasch
 Steven Chamberlain
+Taketo Takashima
 TheBerg
 Thomas Pfister
 Tim Bishop

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"
 
@@ -575,6 +575,7 @@ private
             # Nginx checks for PCRE in multiple places...
             system("(gcc -I/usr/local/include -I/usr/include/pcre " <<
               "-I/usr/pkg/include -I/opt/local/include " <<
+              "-I/opt/homebrew/include " <<
               "-c passenger-check.c) >/dev/null 2>/dev/null")
           end
         ensure

data/build/common_library.rb

@@ -245,7 +245,7 @@ end
 
 ########## WebSocket++ ##########
 
-let(:websocketpp_cflags) { '-Isrc/cxx_supportlib/vendor-copy/websocketpp' }
+let(:websocketpp_cflags) { '-Isrc/cxx_supportlib/vendor-modified/websocketpp' }
 let(:websocketpp_libs) { nil }
 
 

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
@@ -230,8 +245,25 @@ def start
   begin
     prepare
     copy_essential_files
-    copy_dependencies("-std=gnu++11")
-    copy_dependencies("")
+    [
+      "-std=c++98",
+      "-std=c++03",
+      "-std=gnu++98",
+      "-std=gnu++03",
+      "-std=c++11",
+      "-std=gnu++11",
+      "-std=c++14",
+      "-std=gnu++14",
+      "-std=c++17",
+      "-std=gnu++17",
+      "-std=c++20",
+      "-std=gnu++20",
+      "-std=c++0x",
+      "-std=gnu++0x",
+      ""
+    ].product(["-m32","-m64",""]).each do |flags|
+      copy_dependencies(flags)
+    end
   ensure
     cleanup
   end

data/dev/index_cxx_dependencies.rb

@@ -6,7 +6,7 @@ SEARCH_PATHS = [
   "src/agent",
   "src/cxx_supportlib",
   "src/cxx_supportlib/vendor-copy",
-  "src/cxx_supportlib/vendor-copy/websocketpp",
+  "src/cxx_supportlib/vendor-modified/websocketpp",
   "src/cxx_supportlib/vendor-modified",
   "test/cxx"
 ]

data/dev/webpacketpp.patch

@@ -0,0 +1,39 @@
+From b6d45a246a4461cd7eda420b471de50518cb42d8 Mon Sep 17 00:00:00 2001
+From: Camden Narzt <camden@phusion.nl>
+Date: Mon, 19 Jul 2021 12:31:15 -0600
+Subject: [PATCH] fix compilation on gcc older than 4.5
+
+---
+ .../websocketpp/websocketpp/common/functional.hpp        | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/functional.hpp b/src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/functional.hpp
+index d332dd15e..25ed93398 100644
+--- a/src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/functional.hpp
++++ b/src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/functional.hpp
+@@ -52,7 +52,7 @@
+ #ifdef _WEBSOCKETPP_CPP11_FUNCTIONAL_
+     #include <functional>
+ #else
+-    #include <boost/bind.hpp>
++    #include <boost/bind/bind.hpp>
+     #include <boost/function.hpp>
+     #include <boost/ref.hpp>
+ #endif
+@@ -83,12 +83,7 @@ namespace lib {
+     using boost::function;
+     using boost::bind;
+     using boost::ref;
+-    namespace placeholders {
+-        /// \todo this feels hacky, is there a better way?
+-        using ::_1;
+-        using ::_2;
+-        using ::_3;
+-    }
++    namespace placeholders = boost::placeholders;
+ 
+     // See above definition for more details on what this is and why it exists
+     #define _WEBSOCKETPP_REF(x) boost::ref(x)
+-- 
+2.30.1 (Apple Git-130)
+

data/package.json

@@ -27,7 +27,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/phusion/passenger.git"
+    "url": "https://github.com/phusion/passenger.git"
   },
   "author": "Phusion <info@phusion.nl>",
   "license": "MIT",

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.10")
+ *   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/CheckoutSession.cpp

@@ -242,19 +242,25 @@ Controller::reportSessionCheckoutError(Client *client, Request *req,
 	writeOtherExceptionErrorResponse(client, req, e);
 }
 
-void
-Controller::writeRequestQueueFullExceptionErrorResponse(Client *client, Request *req,
-	const boost::shared_ptr<RequestQueueFullException> &e)
+int
+Controller::lookupCodeFromHeader(Request *req, const char* header, int statusCode)
 {
-	TRACE_POINT();
-	const LString *value = req->secureHeaders.lookup(
-		"!~PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE");
-	int requestQueueOverflowStatusCode = 503;
+	const LString *value = req->secureHeaders.lookup(header);
 	if (value != NULL && value->size > 0) {
 		value = psg_lstr_make_contiguous(value, req->pool);
-		requestQueueOverflowStatusCode = stringToInt(
+		statusCode = stringToInt(
 			StaticString(value->start->data, value->size));
 	}
+	return statusCode;
+}
+
+void
+Controller::writeRequestQueueFullExceptionErrorResponse(Client *client, Request *req,
+	const boost::shared_ptr<RequestQueueFullException> &e)
+{
+	TRACE_POINT();
+
+	int requestQueueOverflowStatusCode = lookupCodeFromHeader(req, "!~PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE", 503);
 
 	SKC_WARN(client, "Returning HTTP " << requestQueueOverflowStatusCode <<
 		" due to: " << e->what());
@@ -271,15 +277,20 @@ Controller::writeSpawnExceptionErrorResponse(Client *client, Request *req,
 	const boost::shared_ptr<SpawningKit::SpawnException> &e)
 {
 	TRACE_POINT();
+	int spawnExceptionStatusCode = lookupCodeFromHeader(req, "!~PASSENGER_SPAWN_EXCEPTION_STATUS_CODE", 500);
 	SKC_ERROR(client, "Cannot checkout session because a spawning error occurred. " <<
 		"The identifier of the error is " << e->getId() << ". Please see earlier logs for " <<
 		"details about the error.");
-	endRequestWithErrorResponse(&client, &req, *e);
+	endRequestWithErrorResponse(&client, &req, *e, spawnExceptionStatusCode);
 }
 
 void
 Controller::writeOtherExceptionErrorResponse(Client *client, Request *req, const ExceptionPtr &e) {
 	TRACE_POINT();
+
+	// ATM "other" exceptions always return a spawn exception error message, so use the matching status code
+	int otherExceptionStatusCode = lookupCodeFromHeader(req, "!~PASSENGER_SPAWN_EXCEPTION_STATUS_CODE", 500);
+
 	string typeName;
 	const oxt::tracable_exception &eptr = *e;
 	#ifdef CXX_ABI_API_AVAILABLE
@@ -324,16 +335,16 @@ Controller::writeOtherExceptionErrorResponse(Client *client, Request *req, const
 		}
 		pos = appendData(pos, end, "</p>");
 
-		endRequestWithSimpleResponse(&client, &req, StaticString(buf, pos - buf), 500);
+		endRequestWithSimpleResponse(&client, &req, StaticString(buf, pos - buf), otherExceptionStatusCode);
 	} else {
 		endRequestWithSimpleResponse(&client, &req, "<h2>Internal server error</h2>"
-			"Application could not be started. Please try again later.", 500);
+			"Application could not be started. Please try again later.", otherExceptionStatusCode);
 	}
 }
 
 void
 Controller::endRequestWithErrorResponse(Client **c, Request **r,
-	const SpawningKit::SpawnException &e)
+	const SpawningKit::SpawnException &e, int statusCode)
 {
 	TRACE_POINT();
 	Client *client = *c;
@@ -359,7 +370,7 @@ Controller::endRequestWithErrorResponse(Client **c, Request **r,
 		}
 	}
 
-	endRequestWithSimpleResponse(c, r, psg_pstrdup(req->pool, data), 500);
+	endRequestWithSimpleResponse(c, r, psg_pstrdup(req->pool, data), statusCode);
 }
 
 bool

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.10")
+ *   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/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 StaticString
+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 StaticString 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) {