passenger 6.0.18 → 6.0.20

data/src/cxx_supportlib/vendor-modified/boost/unordered/unordered_node_set_fwd.hpp

@@ -0,0 +1,48 @@
+
+// Copyright (C) 2023 Christian Mazakas
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_UNORDERED_NODE_SET_FWD_HPP_INCLUDED
+#define BOOST_UNORDERED_NODE_SET_FWD_HPP_INCLUDED
+
+#include <boost/config.hpp>
+#if defined(BOOST_HAS_PRAGMA_ONCE)
+#pragma once
+#endif
+
+#include <boost/functional/hash_fwd.hpp>
+#include <functional>
+#include <memory>
+
+namespace boost {
+  namespace unordered {
+    template <class Key, class Hash = boost::hash<Key>,
+      class KeyEqual = std::equal_to<Key>,
+      class Allocator = std::allocator<Key> >
+    class unordered_node_set;
+
+    template <class Key, class Hash, class KeyEqual, class Allocator>
+    bool operator==(
+      unordered_node_set<Key, Hash, KeyEqual, Allocator> const& lhs,
+      unordered_node_set<Key, Hash, KeyEqual, Allocator> const& rhs);
+
+    template <class Key, class Hash, class KeyEqual, class Allocator>
+    bool operator!=(
+      unordered_node_set<Key, Hash, KeyEqual, Allocator> const& lhs,
+      unordered_node_set<Key, Hash, KeyEqual, Allocator> const& rhs);
+
+    template <class Key, class Hash, class KeyEqual, class Allocator>
+    void swap(unordered_node_set<Key, Hash, KeyEqual, Allocator>& lhs,
+      unordered_node_set<Key, Hash, KeyEqual, Allocator>& rhs)
+      noexcept(noexcept(lhs.swap(rhs)));
+  } // namespace unordered
+
+  using boost::unordered::unordered_node_set;
+
+  using boost::unordered::swap;
+  using boost::unordered::operator==;
+  using boost::unordered::operator!=;
+} // namespace boost
+
+#endif

data/src/cxx_supportlib/vendor-modified/boost/unordered/unordered_set.hpp

@@ -15,6 +15,7 @@
 #pragma once
 #endif
 
+#include <boost/unordered/detail/requires_cxx11.hpp>
 #include <boost/core/explicit_operator_bool.hpp>
 #include <boost/functional/hash.hpp>
 #include <boost/move/move.hpp>
@@ -390,6 +391,15 @@ namespace boost {
         return this->emplace(boost::move(x));
       }
 
+      template <class Key>
+      typename boost::enable_if_c<
+        detail::transparent_non_iterable<Key, unordered_set>::value,
+        std::pair<iterator, bool> >::type
+      insert(BOOST_FWD_REF(Key) k)
+      {
+        return table_.try_emplace_unique(boost::forward<Key>(k));
+      }
+
       iterator insert(const_iterator hint, value_type const& x)
       {
         return this->emplace_hint(hint, x);
@@ -400,6 +410,15 @@ namespace boost {
         return this->emplace_hint(hint, boost::move(x));
       }
 
+      template <class Key>
+      typename boost::enable_if_c<
+        detail::transparent_non_iterable<Key, unordered_set>::value,
+        iterator>::type
+      insert(const_iterator hint, BOOST_FWD_REF(Key) k)
+      {
+        return table_.try_emplace_hint_unique(hint, boost::forward<Key>(k));
+      }
+
       template <class InputIt> void insert(InputIt, InputIt);
 
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
@@ -571,6 +590,14 @@ namespace boost {
         return table_.hash_to_bucket(table_.hash(k));
       }
 
+      template <class Key>
+      typename boost::enable_if_c<detail::are_transparent<Key, H, P>::value,
+        size_type>::type
+      bucket(BOOST_FWD_REF(Key) k) const
+      {
+        return table_.hash_to_bucket(table_.hash(boost::forward<Key>(k)));
+      }
+
       local_iterator begin(size_type n)
       {
         return local_iterator(table_.begin(n));
@@ -1212,6 +1239,14 @@ namespace boost {
         return table_.hash_to_bucket(table_.hash(k));
       }
 
+      template <class Key>
+      typename boost::enable_if_c<detail::are_transparent<Key, H, P>::value,
+        size_type>::type
+      bucket(BOOST_FWD_REF(Key) k) const
+      {
+        return table_.hash_to_bucket(table_.hash(boost::forward<Key>(k)));
+      }
+
       local_iterator begin(size_type n)
       {
         return local_iterator(table_.begin(n));

data/src/cxx_supportlib/vendor-modified/boost/unordered/unordered_set_fwd.hpp

@@ -13,7 +13,6 @@
 #endif
 
 #include <boost/functional/hash_fwd.hpp>
-#include <boost/unordered/detail/fwd.hpp>
 #include <functional>
 #include <memory>
 

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

@@ -19,7 +19,7 @@
 //  BOOST_VERSION / 100 % 1000 is the minor version
 //  BOOST_VERSION / 100000 is the major version
 
-#define BOOST_VERSION 108100
+#define BOOST_VERSION 108300
 
 //
 //  BOOST_LIB_VERSION must be defined to be the same as BOOST_VERSION
@@ -27,6 +27,6 @@
 //  number, y is the minor version number, and z is the patch level if not 0.
 //  This is used by <config/auto_link.hpp> to select which library version to link to.
 
-#define BOOST_LIB_VERSION "1_81"
+#define BOOST_LIB_VERSION "1_83"
 
 #endif

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/loader_shared_helpers.rb

@@ -315,7 +315,9 @@ module PhusionPassenger
       # database connection handles.
       if forked
         if defined?(ActiveRecord::Base)
-          if ActiveRecord::Base.respond_to?(:clear_all_connections!)
+          if ActiveRecord::Base.respond_to?(:connection_handler) && !ActiveRecord::Base.connection_handler.nil? && ActiveRecord::Base.connection_handler.respond_to?(:clear_all_connections!)
+            ActiveRecord::Base.connection_handler.clear_all_connections!
+          elsif ActiveRecord::Base.respond_to?(:clear_all_connections!)
             ActiveRecord::Base.clear_all_connections!
           elsif ActiveRecord::Base.respond_to?(:clear_active_connections!)
             ActiveRecord::Base.clear_active_connections!

data/src/ruby_supportlib/phusion_passenger/platform_info/apache.rb

@@ -692,7 +692,7 @@ module PhusionPassenger
         #   /usr/sbin/httpd (for architecture ppc64):       Mach-O 64-bit executable ppc64
         #   /usr/sbin/httpd (for architecture i386):        Mach-O executable i386
         #   /usr/sbin/httpd (for architecture x86_64):      Mach-O 64-bit executable x86_64
-        #   /usr/sbin/httpd (for architecture arm64e):	    Mach-O 64-bit executable arm64e
+        #   /usr/sbin/httpd (for architecture arm64e):	    Mach-O 64-bit executable arm64
         #
         # But on some machines, it may output just:
         #
@@ -701,12 +701,14 @@ module PhusionPassenger
         # (http://code.google.com/p/phusion-passenger/issues/detail?id=236)
         output = `file "#{httpd}"`.strip
         if output =~ /Mach-O fat file/ && output !~ /for architecture/
-          architectures = ["i386", "ppc", "x86_64", "ppc64", "arm64e"]
+          architectures = ["i386", "ppc", "x86_64", "ppc64", "arm64"]
         else
           architectures = []
           output.split("\n").grep(/for architecture/).each do |line|
             line =~ /for architecture (.*?)\)/
-            architectures << $1
+            arch = $1
+            arch = "arm64" if arch.start_with?("arm64")
+            architectures << arch
           end
         end
         # The compiler may not support all architectures in the binary.

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.rb

@@ -31,7 +31,7 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h configkit_schemas_inline_comments' after changing this number.
-  VERSION_STRING = '6.0.18'
+  VERSION_STRING = '6.0.20'
 
   # Tip: find the SHA-256 with ./dev/nginx_version_sha2 <VERSION>
   PREFERRED_NGINX_VERSION = '1.24.0'