passenger 6.0.14 → 6.0.16

data/src/cxx_supportlib/vendor-modified/boost/utility/in_place_factory.hpp

@@ -19,15 +19,21 @@ namespace boost {
 
 class in_place_factory_base {} ;
 
+#ifndef BOOST_UTILITY_DOCS
 #define  BOOST_PP_ITERATION_LIMITS (0, BOOST_MAX_INPLACE_FACTORY_ARITY)
 #define  BOOST_PP_FILENAME_1 <boost/utility/in_place_factory.hpp>
+#endif // BOOST_UTILITY_DOCS
+
 #include BOOST_PP_ITERATE()
 
 } // namespace boost
 
 #include <boost/utility/detail/in_place_factory_suffix.hpp>
 
+#ifndef BOOST_UTILITY_DOCS
 #define BOOST_UTILITY_INPLACE_FACTORY_04APR2007_HPP
+#endif
+
 #else
 #define N BOOST_PP_ITERATION()
 

data/src/cxx_supportlib/vendor-modified/boost/utility/result_of.hpp

@@ -36,9 +36,11 @@
 #  include <boost/preprocessor/facilities/intercept.hpp>
 #endif
 
+#ifndef BOOST_UTILITY_DOCS
 #ifndef BOOST_RESULT_OF_NUM_ARGS
 #  define BOOST_RESULT_OF_NUM_ARGS 16
 #endif
+#endif // BOOST_UTILITY_DOCS
 
 // Use the decltype-based version of result_of by default if the compiler
 // supports N3276 <http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2011/n3276.pdf>.
@@ -51,6 +53,7 @@
   BOOST_RESULT_OF_USE_TR1_WITH_DECLTYPE_FALLBACK cannot be defined at the same time.
 #endif
 
+#ifndef BOOST_UTILITY_DOCS
 #ifndef BOOST_RESULT_OF_USE_TR1
 #  ifndef BOOST_RESULT_OF_USE_DECLTYPE
 #    ifndef BOOST_RESULT_OF_USE_TR1_WITH_DECLTYPE_FALLBACK
@@ -62,6 +65,7 @@
 #    endif
 #  endif
 #endif
+#endif // BOOST_UTILITY_DOCS
 
 namespace boost {
 
@@ -115,8 +119,8 @@ template<typename F> struct cpp0x_result_of;
 
 // There doesn't seem to be any other way to turn this off such that the presence of
 // the user-defined operator,() below doesn't cause spurious warning all over the place,
-// so unconditionally turn it off.
-#if BOOST_MSVC
+// so unconditionally and globally turn it off. (https://svn.boost.org/trac10/ticket/7663)
+#ifdef BOOST_MSVC
 #  pragma warning(disable: 4913) // user defined binary operator ',' exists but no overload could convert all operands, default built-in binary operator ',' used
 #endif
 
@@ -130,12 +134,19 @@ template<typename T>
 result_of_no_type result_of_is_private_type(T const &);
 result_of_yes_type result_of_is_private_type(result_of_private_type);
 
+#ifdef BOOST_MSVC
+#  pragma warning(push)
+#  pragma warning(disable: 4512) // assignment operator could not be generated.
+#endif
 template<typename C>
 struct result_of_callable_class : C {
     result_of_callable_class();
     typedef result_of_private_type const &(*pfn_t)(...);
     operator pfn_t() const volatile;
 };
+#ifdef BOOST_MSVC
+#  pragma warning(pop)
+#endif
 
 template<typename C>
 struct result_of_wrap_callable_class {

data/src/cxx_supportlib/vendor-modified/boost/utility/string_ref.hpp

@@ -128,13 +128,13 @@ namespace boost {
         // capacity
         BOOST_CONSTEXPR size_type size()     const { return len_; }
         BOOST_CONSTEXPR size_type length()   const { return len_; }
-        BOOST_CONSTEXPR size_type max_size() const { return len_; }
+        BOOST_CONSTEXPR size_type max_size() const { return ~static_cast<size_type>(0) / (sizeof(value_type) * 2u); }
         BOOST_CONSTEXPR bool empty()         const { return len_ == 0; }
 
         // element access
         BOOST_CONSTEXPR const charT& operator[](size_type pos) const { return ptr_[pos]; }
 
-        const charT& at(size_t pos) const {
+        const charT& at(size_type pos) const {
             if ( pos >= len_ )
                 BOOST_THROW_EXCEPTION( std::out_of_range ( "boost::string_ref::at" ) );
             return ptr_[pos];
@@ -161,6 +161,10 @@ namespace boost {
 
 
         // basic_string_ref string operations
+        basic_string_ref substr() const {
+            return basic_string_ref(data(), size());
+            }
+
         basic_string_ref substr(size_type pos, size_type n=npos) const {
             if ( pos > size())
                 BOOST_THROW_EXCEPTION( std::out_of_range ( "string_ref::substr" ) );

data/src/cxx_supportlib/vendor-modified/boost/utility/string_view.hpp

@@ -23,6 +23,7 @@
 #include <boost/io/ostream_put.hpp>
 #include <boost/utility/string_view_fwd.hpp>
 #include <boost/throw_exception.hpp>
+#include <boost/assert.hpp>
 
 #include <cstddef>
 #include <stdexcept>
@@ -122,13 +123,13 @@ namespace boost {
         // capacity
         BOOST_CONSTEXPR size_type size()     const BOOST_NOEXCEPT { return len_; }
         BOOST_CONSTEXPR size_type length()   const BOOST_NOEXCEPT { return len_; }
-        BOOST_CONSTEXPR size_type max_size() const BOOST_NOEXCEPT { return len_; }
+        BOOST_CONSTEXPR size_type max_size() const BOOST_NOEXCEPT { return ~static_cast<size_type>(0) / (sizeof(value_type) * 2u); }
         BOOST_CONSTEXPR bool empty()         const BOOST_NOEXCEPT { return len_ == 0; }
 
         // element access
         BOOST_CONSTEXPR const_reference operator[](size_type pos) const BOOST_NOEXCEPT { return ptr_[pos]; }
 
-        BOOST_CONSTEXPR const_reference at(size_t pos) const {
+        BOOST_CONSTEXPR const_reference at(size_type pos) const {
             return pos >= len_ ? BOOST_THROW_EXCEPTION(std::out_of_range("boost::string_view::at")), ptr_[0] : ptr_[pos];
             }
 
@@ -140,6 +141,8 @@ namespace boost {
         void clear() BOOST_NOEXCEPT { len_ = 0; }          // Boost extension
 
         BOOST_CXX14_CONSTEXPR void remove_prefix(size_type n) {
+            BOOST_ASSERT(n <= size());
+            // This check is deprecated and is left for backward compatibility. It will be removed in the future.
             if ( n > len_ )
                 n = len_;
             ptr_ += n;
@@ -147,6 +150,8 @@ namespace boost {
             }
 
         BOOST_CXX14_CONSTEXPR void remove_suffix(size_type n) {
+            BOOST_ASSERT(n <= size());
+            // This check is deprecated and is left for backward compatibility. It will be removed in the future.
             if ( n > len_ )
                 n = len_;
             len_ -= n;
@@ -189,6 +194,10 @@ namespace boost {
             return rlen;
             }
 
+        BOOST_CXX14_CONSTEXPR basic_string_view substr() const {
+            return basic_string_view(data(), size());
+            }
+
         BOOST_CXX14_CONSTEXPR basic_string_view substr(size_type pos, size_type n=npos) const {
             if ( pos > size())
                 BOOST_THROW_EXCEPTION( std::out_of_range ( "string_view::substr" ) );
@@ -201,7 +210,7 @@ namespace boost {
             }
 
         BOOST_CXX14_CONSTEXPR int compare(size_type pos1, size_type n1, basic_string_view x)
-          const BOOST_NOEXCEPT {
+          const {
             return substr(pos1, n1).compare(x);
             }
 
@@ -241,6 +250,18 @@ namespace boost {
                traits::compare(ptr_ + len_ - x.len_, x.ptr_, x.len_) == 0;
             }
 
+        BOOST_CXX14_CONSTEXPR bool contains(basic_string_view s) const BOOST_NOEXCEPT {
+            return find(s) != npos;
+            }
+
+        BOOST_CXX14_CONSTEXPR bool contains(charT c) const BOOST_NOEXCEPT {
+            return find(c) != npos;
+            }
+
+        BOOST_CXX14_CONSTEXPR bool contains(const charT* s) const BOOST_NOEXCEPT {
+            return find(s) != npos;
+            }
+
         //  find
         BOOST_CXX14_CONSTEXPR size_type find(basic_string_view s, size_type pos = 0) const BOOST_NOEXCEPT {
             if (pos > size())

data/src/cxx_supportlib/vendor-modified/boost/utility/typed_in_place_factory.hpp

@@ -19,15 +19,20 @@ namespace boost {
 
 class typed_in_place_factory_base {} ;
 
+#ifndef BOOST_UTILITY_DOCS
 #define  BOOST_PP_ITERATION_LIMITS (0, BOOST_MAX_INPLACE_FACTORY_ARITY)
 #define  BOOST_PP_FILENAME_1 <boost/utility/typed_in_place_factory.hpp>
-#include BOOST_PP_ITERATE()
+#endif // BOOST_UTILITY_DOCS
 
+#include BOOST_PP_ITERATE()
 } // namespace boost
 
 #include <boost/utility/detail/in_place_factory_suffix.hpp>
 
+#ifndef BOOST_UTILITY_DOCS
 #define BOOST_UTILITY_TYPED_INPLACE_FACTORY_04APR2007_HPP
+#endif // BOOST_UTILITY_DOCS
+
 #else 
 #define N BOOST_PP_ITERATION()
 

data/src/cxx_supportlib/vendor-modified/boost/utility/value_init.hpp

@@ -23,7 +23,7 @@
 // contains. More details on these issues are at libs/utility/value_init.htm
 
 #include <boost/config.hpp> // For BOOST_NO_COMPLETE_VALUE_INITIALIZATION.
-#include <boost/swap.hpp>
+#include <boost/core/swap.hpp>
 #include <cstring>
 #include <cstddef>
 
@@ -37,6 +37,8 @@
 #pragma warning(disable: 4512)
 #endif
 
+#ifndef BOOST_UTILITY_DOCS
+
 #ifdef BOOST_NO_COMPLETE_VALUE_INITIALIZATION
   // Implementation detail: The macro BOOST_DETAIL_VALUE_INIT_WORKAROUND_SUGGESTED 
   // suggests that a workaround should be applied, because of compiler issues 
@@ -54,6 +56,8 @@
   #endif
 #endif
 
+#endif // BOOST_UTILITY_DOCS
+
 namespace boost {
 
 namespace detail {

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 107700
+#define BOOST_VERSION 108000
 
 //
 //  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_77"
+#define BOOST_LIB_VERSION "1_80"
 
 #endif

data/src/ruby_supportlib/phusion_passenger/packaging.rb

@@ -88,6 +88,7 @@ module PhusionPassenger
       '**/.DS_Store',
       '**/*.gch',
       '**/.editorconfig',
+      '**/.clangd',
       '.externalToolBuilders/**/*',
       '.github/**/*',
       '.settings/**/*',

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

@@ -687,11 +687,12 @@ module PhusionPassenger
         # Running 'file' on the Apache executable usually outputs something
         # like this:
         #
-        #   /usr/sbin/httpd: Mach-O universal binary with 4 architectures
+        #   /usr/sbin/httpd: Mach-O universal binary with 5 architectures
         #   /usr/sbin/httpd (for architecture ppc7400):     Mach-O executable ppc
         #   /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
         #
         # But on some machines, it may output just:
         #
@@ -700,7 +701,7 @@ 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"]
+          architectures = ["i386", "ppc", "x86_64", "ppc64", "arm64e"]
         else
           architectures = []
           output.split("\n").grep(/for architecture/).each do |line|

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

@@ -72,7 +72,7 @@ module PhusionPassenger
             # some OS X print something like:
             #   "/opt/ruby-enterprise/bin/ruby: Mach-O 64-bit executable"
             if output =~ /arm64/
-              ruby_arch = "arm"
+              ruby_arch = "arm64"
             elsif output =~ /Mach-O 64-bit/
               ruby_arch = "x86_64"
             else

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

@@ -187,7 +187,7 @@ module PhusionPassenger
           flags << '-D_XOPEN_SOURCE=500 -D_XPG4_2 -D__EXTENSIONS__ -D__SOLARIS__ -D_FILE_OFFSET_BITS=64'
           flags << '-D__SOLARIS9__ -DBOOST__STDC_CONSTANT_MACROS_DEFINED' if os_name_full =~ /solaris2\.9/
         end
-        flags << '-DBOOST_HAS_STDINT_H' unless os_name_full =~ /solaris2\.9/
+        flags << '-DBOOST_HAS_STDINT_H' unless os_name_full =~ /solaris2\.(9|10|11)/
         if send("#{cc_or_cxx}_is_sun_studio?")
           flags << '-xtarget=ultra' if RUBY_PLATFORM =~ /sparc/
         else

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

@@ -161,12 +161,12 @@ module PhusionPassenger
         major, minor, *rest = os_version.split(".").map(&:to_i)
         if major >= 11 || (major == 10 && minor >= 16)
           # Since Big Sur aarch64 is supported, and default on m1 macs.
-          if `uname -m` =~ /arm64/
-            ["arm", "x86_64"]
+          if `#{uname_command} -m` =~ /arm64/
+            ["arm64", "x86_64"]
           elsif `sysctl -in sysctl.proc_translated` == "1"
-            ["arm", "x86_64"]
+            ["arm64", "x86_64"]
           else
-            ["x86_64", "arm"]
+            ["x86_64", "arm64"]
           end
         elsif minor == 15
           # Since Catalina x86 is gone.

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

@@ -309,10 +309,10 @@ module PhusionPassenger
 
         # That failed too. Try extracting info from from $LOAD_PATH.
         matching_path = $LOAD_PATH.find_all do |item|
-          item.include?("rvm/gems/")
+          item.include?("rvm/gems/") || item.include?("rvm/rubies/")
         end
         if matching_path && !matching_path.empty?
-          subpath = matching_path.to_s.gsub(/^.*rvm\/gems\//, '')
+          subpath = matching_path.to_s.gsub(/^.*rvm\/(gems|rubies)\//, '')
           result = subpath.split('/').first
           return result if result
         end

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

@@ -106,6 +106,9 @@ module PhusionPassenger
           begin
             status, headers, body = @app.call(env)
           rescue => e
+            if e.is_a?(Errno::ENOBUFS)
+              raise e
+            end
             if !should_swallow_app_error?(e, socket_wrapper)
               # It's a good idea to catch application exceptions here because
               # otherwise maliciously crafted responses can crash the app,
@@ -155,6 +158,9 @@ module PhusionPassenger
             process_body(env, connection, socket_wrapper, status.to_i, is_head_request,
               headers, body)
           rescue => e
+            if e.is_a?(Errno::ENOBUFS)
+              raise e
+            end
             if !should_swallow_app_error?(e, socket_wrapper)
               print_exception("Rack response body object", e)
             end
@@ -324,6 +330,9 @@ module PhusionPassenger
         begin
           body.close if body && body.respond_to?(:close)
         rescue => e
+          if e.is_a?(Errno::ENOBUFS)
+            raise e
+          end
           if !should_swallow_app_error?(e, socket_wrapper)
             print_exception("Rack response body object's #close method", e)
           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.14'
+  VERSION_STRING = '6.0.16'
 
   # Tip: find the SHA-256 with ./dev/nginx_version_sha2 <VERSION>
   PREFERRED_NGINX_VERSION = '1.20.2'