passenger 6.0.17 → 6.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4745b4abf125d1350bf6ea520477b1d8a1faae26
-  data.tar.gz: e3fe30496ed0567cd283f3ee96751c6baaa35f00
+SHA256:
+  metadata.gz: 4d6c6aa2e5aebe46db8eaac696afa9aab27bc8d54f50bd220e465ab42bcf3791
+  data.tar.gz: c57f1e7ba334127a9a8f17c5b7e9ed44758b38ecac0d50b0fa1cb4132382b4db
 SHA512:
-  metadata.gz: f561f10cee769f11824a2c8bbd74d35b8305e22906682af51ec68819cc53fbeb27ce6a57fbe7022eff27adb4cd0dded348a2a7d7b3051ce8d11054c66a8e3f16
-  data.tar.gz: 97198581be7ab01b816beeab4b6e2cbd90182af418410cd298a3290c1ec2c97a1473c1ae63376e362337dd06e33e93e8ee5ba247d9935159dd4cafcaf4fb1211
+  metadata.gz: 3c778980e85efdc20b16d636607c4d1ec96684c523ce0a2e8d3a2b0199222412023b18c826bacb6744dedb9035fde1e82c3dc96fe9fdaa453c79c7b86c41746a
+  data.tar.gz: 1666e6ae1719c0ccf9a03e9ef05855054f433c7fe68b9c0fbc4b1485db313fc7d30ffe3d26fa6ee11b3420d6a1d85b4f4324cffcb5528512bcd9aaa1cb4cc220

data/CHANGELOG

@@ -1,14 +1,62 @@
-Release 6.0.17 (Not yet released)
+Release 6.0.19 (Not yet released)
+-------------
+ * [Ruby] Fix compatibility with Rack 3 header array. Closses GH-2503.
+ * [Ruby] Preserve `SIGPROF` signal handlers. Contributed by Ivo Anjo. Closes GH-2489.
+ * [Python] Replaces use of imp module with importlib in Python 3. Contributed by Rongxin Liu. Closes GH-2399 and GH-2501.
+ * [Ubuntu] Removes packages for Ubuntu 18.04 "Bionic" (EOL June 2023).
+ * [Ubuntu] Adds packages for Ubuntu 23.04 "mantic".
+ * Fixed a memory allocation bug in the security update checker.
+ * [Debian] Add Debian 12 Bookworm packages. Closes GH-2488.
+ * [RPM] Published arm64/aarch64 rpms for EL8 & EL9 (RHEL, Rocky, Alma). Closes GH-2452.
+ * [ARM] Publishes prebuilt arm64/aarch64 binaries for Passenger gem installs. Closes GH-2288.
+ * [ARM] Fixes a regression in Passenger 6.0.7 where strict-aliasing archs (notably: aarch64 aka ARM64) builds of Passenger were always building for big-endian archs. Closes GH-2451 and GH-2419.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+   - ccache: 4.6.3 -> 4.8.3
+   - cmake: 3.26.4 -> 3.27.7
+   - curl: 8.1.2 -> 8.4.0
+   - git: 2.41.0 -> 2.42.0
+   - gnupg: 2.4.2 -> 2.4.3
+   - libassuan: 2.5.5 -> 2.5.6
+   - libksba: 1.6.3 -> 1.6.4
+   - openssl: 3.1.1 -> 3.1.4
+   - rubygems: 3.4.13 -> 3.4.21
+   - zlib: 1.2.13 -> 1.3
+
+
+Release 6.0.18
+-------------
+ * Adds Ubuntu 23.04 "Lunar" packages, removes Ubuntu 22.10 "Kinetic" packages.
+ * Removes packages for Debian 9 "Stretch" (EOL June 2022).
+ * [RPM] Changes to building Nginx module packages for the latest supported Nginx module stream instead of the default.
+ * [Ruby] Makes Passenger more resilient to invalid byte sequences when loading the Ruby native extension. Contributed by Drew Wells.
+ * [Ruby] Add an `unhandled_exception_before_exit` event callback. Contributed by James Tomson.
+ * [Nginx] Upgrades preferred Nginx to 1.24.0 from 1.22.1.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+   - cmake: 3.25.1 -> 3.26.4
+   - curl: 7.87.0 -> 8.1.2
+   - git: 2.39.0 -> 2.41.0
+   - gnupg: 2.4.0 -> 2.4.2
+   - libgcrypt: 1.10.1 -> 1.10.2
+   - libgpg_error: 1.46 -> 1.47
+   - openssl: 3.0.7 -> 3.1.1
+   - rubygems: 3.4.3 -> 3.4.13
+   - zstd: 1.5.2 -> 1.5.5
+   - rubies:
+     - 2.7.7 -> 2.7.8
+     - 3.0.5 -> 3.0.6
+     - 3.1.3 -> 3.1.4
+     - 3.2.0 -> 3.2.2
+
+
+Release 6.0.17
 -------------
  * [Enterprise] The `debug` gem is now supported for debugging on Ruby 3.1.
  * Removed use of deprecated 'File.exists?' method for Ruby 3.2.0.
  * Upgrades Boost to 1.81.
  * Upgrades preferred Nginx to 1.22.1 from 1.20.2.
  * Changes minimum supported macOS version to 10.14 Mojave.
- * Adds support for arm (aarch64) rpm packages.
  * Adds support for a `PASSENGER_MAX_LOG_LINE_LENGTH_BYTES` environment variable. The default length remains at 8KB. Closes GH-2413.
  * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
-   - ccache: 4.6.3 → 4.7.4
    - curl: 7.86.0 → 7.87.0
    - git: 2.38.1 → 2.39.0
    - gnupg: 2.3.8 → 2.4.0
@@ -25,7 +73,6 @@ Release 6.0.16
  * Adds systemd private tmpdir workaround on Ubuntu/Debian. Closes GH-2397.
  * Downgrade jsoncpp to 1.8.1 from 1.9.5 to fix invalid json generation bug. Closes GH-2445.
  * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
-   - ccache: 4.6.3 → 4.7.4
    - cmake: 3.24.2 → 3.25.1
    - curl: 7.85.0 → 7.86.0
    - git 2.37.3 → 2.38.1

data/CONTRIBUTORS

@@ -30,6 +30,7 @@ David Sissitka
 Dirk Mueller
 Dmitry Galinsky
 dr.dimitru
+drew-wells
 Dylan Vaughn
 Eric Covener
 Erik Ogan
@@ -47,11 +48,13 @@ Ian Kottman
 Igor Vuk
 isaac
 Isaac Reuben
+Ivo Anjo
 J Smith
 J.W. Koelewijn
 Jacob Elder
 Jacob Harris
 James Miller
+James Tomson
 Jan Berkel
 Janko Marohnić
 Jason Cannon
@@ -103,6 +106,7 @@ Rob Paisley
 Robin Bowes
 Romain Tartière
 ROMB
+Rongxin Liu
 Ruslan Ermilov (NGINX Inc)
 Ryan Schwartz
 Ryo Onodera

data/build/test_basics.rb

@@ -62,9 +62,13 @@ task 'test:install_deps' do
   end
 
   if install_base_deps
-    sh "bundle install #{bundle_args} --without="
+    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0') || RUBY_PLATFORM =~ /darwin/
+      sh "bundle install #{bundle_args} --without="
+    else
+      sh "bundle install #{bundle_args} --without future"
+    end
   else
-    sh "bundle install #{bundle_args} --without base"
+    sh "bundle install #{bundle_args} --without base future"
   end
 
   if boolean_option('NODE_MODULES', default)

data/dev/copy_boost_headers

@@ -24,56 +24,56 @@
 #  THE SOFTWARE.
 
 ESSENTIALS = [
-  "boost/detail/{limits,endian}.hpp",
-  "boost/config*",
-  "boost/mpl",
-  "boost/preprocessor/stringize.hpp",
-  "boost/smart_ptr/detail/sp_counted_*",
-  "boost/smart_ptr/detail/atomic_count*",
-  "boost/smart_ptr/detail/spinlock*",
+  "boost/*regex*",
+  "boost/algorithm/string",
+  "boost/asio*",
   "boost/atomic",
-  "boost/pool",
-  "boost/unordered*",
-  "boost/thread",
-  "boost/intrusive",
+  "boost/bind",
+  "boost/chrono*",
+  "boost/config*",
   "boost/container",
-  "boost/predef",
-  "boost/move",
   "boost/core",
-  "boost/bind",
+  "boost/cstdint.hpp",
+  "boost/date_time",
+  "boost/date_time/date_formatting_limited.hpp",
+  "boost/date_time/gregorian/formatters_limited.hpp",
+  "boost/detail/fenv.hpp",
+  "boost/detail/reference_content.hpp",
+  "boost/foreach.hpp",
   "boost/function",
-  "boost/ratio*",
   "boost/integer*",
-  "boost/chrono*",
-  "boost/random*",
-  "boost/asio*",
-  "boost/optional.hpp",
+  "boost/intrusive",
+  "boost/move",
+  "boost/mpl",
+  "boost/non_type.hpp",
+  "boost/none*",
   "boost/optional",
-  "boost/utility",
-  "libs/thread/src",
-  "libs/system/src",
-  "libs/regex/src",
-  "libs/chrono/src",
-  "libs/random/src",
-  "boost/preprocessor",
+  "boost/optional.hpp",
   "boost/parameter",
-  "boost/date_time/gregorian/formatters_limited.hpp",
-  "boost/date_time/date_formatting_limited.hpp",
-  "boost/type_traits/make_signed.hpp",
+  "boost/pool",
+  "boost/predef",
+  "boost/predef/other/endian.h",
+  "boost/preprocessor",
+  "boost/preprocessor/stringize.hpp",
+  "boost/random*",
+  "boost/ratio*",
+  "boost/smart_ptr/detail/atomic_count*",
+  "boost/smart_ptr/detail/sp_counted_*",
+  "boost/smart_ptr/detail/spinlock*",
+  "boost/system/config.hpp",
+  "boost/system/detail/error_code.ipp",
+  "boost/thread",
+  "boost/type_traits",
   "boost/type_traits/detail/*",
+  "boost/type_traits/make_signed.hpp",
   "boost/typeof",
-  "boost/date_time",
-  "boost/type_traits",
-  "boost/cstdint.hpp",
-  "boost/*regex*",
-  "boost/non_type.hpp",
-  "boost/detail/fenv.hpp",
-  "boost/foreach.hpp",
-  "boost/none*",
-  "boost/system/detail/error_code.ipp",
-  "boost/system/config.hpp",
-  "boost/detail/reference_content.hpp",
-  "boost/algorithm/string"
+  "boost/unordered*",
+  "boost/utility",
+  "libs/chrono/src",
+  "libs/random/src",
+  "libs/regex/src",
+  "libs/system/src",
+  "libs/thread/src",
 ]
 EXCLUDE = [
   "libs/thread/src/win32/*",
@@ -87,43 +87,59 @@ EXCLUDE = [
   "boost/asio/detail/impl/win*"
 ]
 PROGRAM_SOURCE = %q{
-  #include <boost/shared_ptr.hpp>
-  #include <boost/shared_array.hpp>
-  #include <boost/weak_ptr.hpp>
-  #include <boost/make_shared.hpp>
-  #include <boost/enable_shared_from_this.hpp>
-  #include <boost/intrusive_ptr.hpp>
-  #include <boost/smart_ptr/intrusive_ref_counter.hpp>
-  #include <boost/thread.hpp>
-  #include <boost/noncopyable.hpp>
-  #include <boost/function.hpp>
-  #include <boost/bind/bind.hpp>
-  #include <boost/container/vector.hpp>
-  #include <boost/date_time/posix_time/posix_time.hpp>
-  #include <boost/foreach.hpp>
-  #include <boost/unordered_map.hpp>
-  #include <boost/regex.hpp>
-  #include <boost/pool/object_pool.hpp>
-  #include <boost/move/core.hpp>
-  #include <boost/move/utility.hpp>
+  #include <boost/aligned_storage.hpp>
+  #include <boost/asio.hpp>
+  #include <boost/asio/ssl.hpp>
+  #include <boost/asio/steady_timer.hpp>
   #include <boost/atomic.hpp>
-  #include <boost/typeof/typeof.hpp>
+  #include <boost/bind/bind.hpp>
+  #include <boost/chrono.hpp>
   #include <boost/circular_buffer.hpp>
   #include <boost/config.hpp>
   #include <boost/container/small_vector.hpp>
+  #include <boost/container/vector.hpp>
   #include <boost/core/noncopyable.hpp>
   #include <boost/cstdint.hpp>
   #include <boost/current_function.hpp>
+  #include <boost/date_time/posix_time/posix_time.hpp>
   #include <boost/date_time/posix_time/posix_time_types.hpp>
+  #include <boost/enable_shared_from_this.hpp>
+  #include <boost/foreach.hpp>
+  #include <boost/function.hpp>
+  #include <boost/intrusive_ptr.hpp>
+  #include <boost/make_shared.hpp>
+  #include <boost/move/core.hpp>
   #include <boost/move/move.hpp>
+  #include <boost/move/utility.hpp>
+  #include <boost/noncopyable.hpp>
+  #include <boost/nondet_random.hpp>
+  #include <boost/pointer_cast.hpp>
+  #include <boost/pool/object_pool.hpp>
   #include <boost/predef.h>
+  #include <boost/predef/other/endian.h>
+  #include <boost/random/random_device.hpp>
+  #include <boost/random/uniform_int_distribution.hpp>
   #include <boost/ref.hpp>
+  #include <boost/regex.hpp>
   #include <boost/scoped_array.hpp>
   #include <boost/scoped_ptr.hpp>
+  #include <boost/shared_array.hpp>
+  #include <boost/shared_ptr.hpp>
+  #include <boost/smart_ptr/intrusive_ref_counter.hpp>
   #include <boost/static_assert.hpp>
+  #include <boost/system/error_code.hpp>
+  #include <boost/system/system_error.hpp>
+  #include <boost/thread.hpp>
+  #include <boost/thread/condition_variable.hpp>
   #include <boost/thread/mutex.hpp>
+  #include <boost/thread/once.hpp>
   #include <boost/thread/tss.hpp>
+  #include <boost/typeof/typeof.hpp>
+  #include <boost/unordered_map.hpp>
+  #include <boost/version.hpp>
+  #include <boost/weak_ptr.hpp>
 // Included despite not used in Passenger
+  #include <boost/thread/thread_time.hpp>
   #include <boost/cregex.hpp>
   #include <boost/pointer_cast.hpp>
   #include <boost/asio.hpp>

data/src/agent/Core/Config.h

@@ -165,7 +165,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.17")
+ *   server_software                                                 string             -          default("Phusion_Passenger/6.0.19")
  *   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

@@ -116,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.17")
+ *   server_software                                     string             -          default("Phusion_Passenger/6.0.19")
  *   show_version_in_header                              boolean            -          default(true)
  *   start_reading_after_accept                          boolean            -          default(true)
  *   stat_throttle_rate                                  unsigned integer   -          default(10)

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/Watchdog/Config.h

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

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.17"
+#define PASSENGER_VERSION "6.0.19"
 #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/modp_b64_strict_aliasing.cpp

@@ -89,7 +89,7 @@ size_t modp_b64_decode(char* dest, const char* src, size_t len)
 	case 0:
 		x = d0[y[3]] | d1[y[2]] | d2[y[1]] | d3[y[0]];
 		if (x >= B64_BADCHAR)  return -1;
-#ifdef BOOST_ENDIAN_BIG_BYTE
+#if BOOST_ENDIAN_BIG_BYTE
 		*p++ = ((modp_uint8_t*)&x)[1];
 		*p++ = ((modp_uint8_t*)&x)[2];
 		*p   = ((modp_uint8_t*)&x)[3];

data/src/helper-scripts/wsgi-loader.py

@@ -23,8 +23,12 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-import sys, os, re, imp, threading, signal, traceback, socket, select, struct, logging, errno
+import sys, os, threading, signal, traceback, socket, select, struct, logging, errno
 import tempfile, json, time
+if sys.version_info[0] >= 3:
+	from importlib import util
+else:
+	import imp
 
 options = {}
 
@@ -37,7 +41,7 @@ def try_write_file(path, contents):
 		with open(path, 'w') as f:
 			f.write(contents)
 	except IOError as e:
-		logging.warn('Warning: unable to write to ' + path + ': ' + e.message)
+		logging.warn('Warning: unable to write to ' + path + ': ' + e.strerror)
 
 def initialize_logging():
 	logging.basicConfig(
@@ -50,18 +54,21 @@ def read_startup_arguments():
 	global options
 
 	work_dir = os.getenv('PASSENGER_SPAWN_WORK_DIR')
+	assert work_dir is not None
 	path = work_dir + '/args.json'
 	with open(path, 'r') as f:
 		options = json.load(f)
 
 def record_journey_step_begin(step, state):
 	work_dir = os.getenv('PASSENGER_SPAWN_WORK_DIR')
+	assert work_dir is not None
 	step_dir = work_dir + '/response/steps/' + step.lower()
 	try_write_file(step_dir + '/state', state)
 	try_write_file(step_dir + '/begin_time', str(time.time()))
 
 def record_journey_step_end(step, state):
 	work_dir = os.getenv('PASSENGER_SPAWN_WORK_DIR')
+	assert work_dir is not None
 	step_dir = work_dir + '/response/steps/' + step.lower()
 	try_write_file(step_dir + '/state', state)
 	if not os.path.exists(step_dir + '/begin_time') and not os.path.exists(step_dir + '/begin_time_monotonic'):
@@ -73,7 +80,15 @@ def load_app():
 
 	sys.path.insert(0, os.getcwd())
 	startup_file = options.get('startup_file', 'passenger_wsgi.py')
-	return imp.load_source('passenger_wsgi', startup_file)
+	if sys.version_info[0] >= 3:
+		spec = util.spec_from_file_location("passenger_wsgi", startup_file)
+		assert spec is not None
+		app_module = util.module_from_spec(spec)
+		assert spec.loader is not None
+		spec.loader.exec_module(app_module)
+		return app_module
+	else:
+		return imp.load_source('passenger_wsgi', startup_file)
 
 def create_server_socket():
 	global options
@@ -88,13 +103,8 @@ def create_server_socket():
 
 	i = 0
 	while i < 128:
-		s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-		socket_suffix = format(struct.unpack('Q', os.urandom(8))[0], 'x')
-		filename = socket_dir + '/' + socket_prefix + '.' + socket_suffix
-		filename = filename[0:UNIX_PATH_MAX]
 		try:
-			s.bind(filename)
-			break
+			return make_socket(socket_dir, socket_prefix, UNIX_PATH_MAX)
 		except socket.error as e:
 			if e.errno == errno.EADDRINUSE:
 				i += 1
@@ -103,6 +113,12 @@ def create_server_socket():
 			else:
 				raise e
 
+def make_socket(socket_dir, socket_prefix, UNIX_PATH_MAX):
+	s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+	socket_suffix = format(struct.unpack('Q', os.urandom(8))[0], 'x')
+	filename = socket_dir + '/' + socket_prefix + '.' + socket_suffix
+	filename = filename[0:UNIX_PATH_MAX]
+	s.bind(filename)
 	s.listen(1000)
 	return (filename, s)
 
@@ -130,6 +146,7 @@ def install_signal_handlers():
 
 def advertise_sockets(socket_filename):
 	work_dir = os.getenv('PASSENGER_SPAWN_WORK_DIR')
+	assert work_dir is not None
 	path = work_dir + '/response/properties.json'
 	doc = {
 		'sockets': [
@@ -147,6 +164,7 @@ def advertise_sockets(socket_filename):
 
 def advertise_readiness():
 	work_dir = os.getenv('PASSENGER_SPAWN_WORK_DIR')
+	assert work_dir is not None
 	path = work_dir + '/response/finish'
 	with open(path, 'w') as f:
 		f.write('1')
@@ -173,7 +191,6 @@ else:
 	def str_to_bytes(s):
 		return s
 
-
 class RequestHandler:
 	def __init__(self, server_socket, owner_pipe, app):
 		self.server = server_socket
@@ -194,13 +211,12 @@ class RequestHandler:
 						env, input_stream = self.parse_request(client)
 						if env:
 							if env['REQUEST_METHOD'] == 'ping':
-								self.process_ping(env, input_stream, client)
+								self.process_ping(client)
 							else:
 								socket_hijacked = self.process_request(env, input_stream, client)
 					except KeyboardInterrupt:
 						done = True
-					except IOError:
-						e = sys.exc_info()[1]
+					except IOError as e:
 						if not getattr(e, 'passenger', False) or e.errno != errno.EPIPE:
 							logging.exception("WSGI application raised an I/O exception!")
 					except Exception:
@@ -298,10 +314,9 @@ class RequestHandler:
 					output_stream.sendall(b'\r\n')
 				if not is_head:
 					output_stream.sendall(str_to_bytes(data))
-			except IOError:
+			except IOError as e:
 				# Mark this exception as coming from the Phusion Passenger
 				# socket and not some other socket.
-				e = sys.exc_info()[1]
 				setattr(e, 'passenger', True)
 				raise e
 
@@ -347,7 +362,7 @@ class RequestHandler:
 				result.close()
 		return False
 
-	def process_ping(self, env, input_stream, output_stream):
+	def process_ping(self, output_stream):
 		output_stream.sendall(b"pong")
 
 
@@ -376,7 +391,9 @@ if __name__ == "__main__":
 
 	record_journey_step_begin('SUBPROCESS_LISTEN', 'STEP_IN_PROGRESS')
 	try:
-		socket_filename, server_socket = create_server_socket()
+		tuple = create_server_socket()
+		assert tuple is not None
+		socket_filename, server_socket = tuple
 		install_signal_handlers()
 		handler = RequestHandler(server_socket, sys.stdin, app_module.application)
 		advertise_sockets(socket_filename)

data/src/ruby_supportlib/phusion_passenger/native_support.rb

@@ -427,10 +427,12 @@ module PhusionPassenger
         require(name_or_filename)
         return defined?(PhusionPassenger::NativeSupport)
       rescue LoadError => e
-        if e.to_s =~ /dlopen/
+        s = e.to_s
+        s = s.encode("US-ASCII", :invalid => :replace) if s.respond_to?(:encode)
+        if s =~ /dlopen/
           # Print dlopen failures. We're not interested in any other
           # kinds of failures, such as file-not-found.
-          puts e.to_s.gsub(/^/, "     ")
+          puts s.gsub(/^/, "     ")
         end
         return false
       end

data/src/ruby_supportlib/phusion_passenger/public_api.rb

@@ -30,6 +30,7 @@ module PhusionPassenger
     @@event_credentials = []
     @@event_after_installing_signal_handlers = []
     @@event_oob_work = []
+    @@event_unhandled_exception_before_exit = []
     @@advertised_concurrency_level = nil
 
     def on_event(name, &block)
@@ -69,6 +70,8 @@ module PhusionPassenger
         @@event_after_installing_signal_handlers
       when :oob_work
         @@event_oob_work
+      when :unhandled_exception_before_exit
+        @@event_unhandled_exception_before_exit
       else
         raise ArgumentError, "Unknown event name '#{name}'"
       end

data/src/ruby_supportlib/phusion_passenger/rack/thread_handler_extension.rb

@@ -41,7 +41,7 @@ module PhusionPassenger
     module ThreadHandlerExtension
       # Constants which exist to relieve Ruby's garbage collector.
       RACK_VERSION       = "rack.version"        # :nodoc:
-      RACK_VERSION_VALUE = [1, 2]                # :nodoc:
+      RACK_VERSION_VALUE = [1, 3]                # :nodoc:
       RACK_INPUT         = "rack.input"          # :nodoc:
       RACK_ERRORS        = "rack.errors"         # :nodoc:
       RACK_MULTITHREAD   = "rack.multithread"    # :nodoc:
@@ -349,6 +349,8 @@ module PhusionPassenger
         headers.each do |key, values|
           if values.is_a?(String)
             values = values.split(NEWLINE)
+          elsif values.is_a?(Array)
+            # values already array
           elsif key == RACK_HIJACK
             # We do not check for this key name in every loop
             # iteration as an optimization.

data/src/ruby_supportlib/phusion_passenger/ruby_core_enhancements.rb

@@ -147,6 +147,11 @@ module Signal
     result.delete("KILL")
     result.delete("EXIT")
 
+    # Profilers such as ddtrace and stackprof use this signal, so removing the
+    # the handler causes the Ruby process to crash when profilers are operating.
+    # See https://github.com/phusion/passenger/issues/2489 for details.
+    result.delete("PROF")
+
     return result
   end
 end

data/src/ruby_supportlib/phusion_passenger/utils.rb

@@ -115,6 +115,7 @@ module PhusionPassenger
           raise
         rescue Exception => e
           print_exception(nil, e)
+          PhusionPassenger.call_event(:unhandled_exception_before_exit, e)
           exit(1)
         end
       end

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,16 +31,16 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h configkit_schemas_inline_comments' after changing this number.
-  VERSION_STRING = '6.0.17'
+  VERSION_STRING = '6.0.19'
 
   # Tip: find the SHA-256 with ./dev/nginx_version_sha2 <VERSION>
-  PREFERRED_NGINX_VERSION = '1.22.1'
-  NGINX_SHA256_CHECKSUM = '9ebb333a9e82b952acd3e2b4aeb1d4ff6406f72491bab6cd9fe69f0dea737f31'
+  PREFERRED_NGINX_VERSION = '1.24.0'
+  NGINX_SHA256_CHECKSUM = '77a2541637b92a621e3ee76776c8b7b40cf6d707e69ba53a940283e30ff2f55d'
 
   # Packaging may be locked to an older version due to the specific module configuration being
   # incompatible with the version we prefer (latest stable).
-  PACKAGING_PREFERRED_NGINX_VERSION = '1.22.1'
-  PACKAGING_NGINX_SHA256_CHECKSUM = '9ebb333a9e82b952acd3e2b4aeb1d4ff6406f72491bab6cd9fe69f0dea737f31'
+  PACKAGING_PREFERRED_NGINX_VERSION = '1.24.0'
+  PACKAGING_NGINX_SHA256_CHECKSUM = '77a2541637b92a621e3ee76776c8b7b40cf6d707e69ba53a940283e30ff2f55d'
 
   # sha256sum of the .tar.gz
   PREFERRED_PCRE_VERSION  = '8.45'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 6.0.17
+  version: 6.0.19
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-23 00:00:00.000000000 Z
+date: 2023-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -5068,8 +5068,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: A fast and robust web server and application server for Ruby, Python and