passenger 6.2.1 → 6.2.2

data/src/nginx_module/ContentHandler.c

@@ -174,6 +174,20 @@ cleanup_detector_result(void *data) {
     psg_app_type_detector_result_deinit((PsgAppTypeDetectorResult *) data);
 }
 
+/* The request that we send to the Core is a CRLF-delimited HTTP header block.
+ * The Core trusts every secure header ("!~" prefix) that comes after the
+ * Core password header. So if a request-derived value that we serialize as
+ * a secure header contains CR or LF, then the client can inject arbitrary
+ * secure headers, such as an app start command. Such values must be rejected.
+ */
+static int
+contains_header_delimiter(const ngx_str_t *str)
+{
+    return str->len > 0
+        && (memchr(str->data, '\r', str->len) != NULL
+            || memchr(str->data, '\n', str->len) != NULL);
+}
+
 static int
 find_base_uri(ngx_http_request_t *r, const passenger_loc_conf_t *loc,
               ngx_str_t *found_base_uri)
@@ -1038,6 +1052,18 @@ create_request(ngx_http_request_t *r)
     }
     request_size = construct_request_buffer(r, slcf, context, &state, NULL);
 
+    /* We check this here instead of in passenger_content_handler() because
+     * r->headers_in.user may only have been populated just now: it is filled
+     * lazily when something evaluates $remote_user, such as a
+     * passenger_set_header value.
+     */
+    if (contains_header_delimiter(&r->headers_in.user)) {
+        ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
+            "rejecting request because the authenticated user name "
+            "contains a CR or LF character");
+        return NGX_ERROR;
+    }
+
     b = ngx_create_temp_buf(r->pool, request_size);
     if (b == NULL) {
         return NGX_ERROR;
@@ -1731,6 +1757,15 @@ passenger_content_handler(ngx_http_request_t *r)
         context->public_dir.data = (u_char *) "/";
         context->public_dir.len = 1;
     }
+    /* The document root can contain request-derived data, e.g. when `root`
+     * contains a variable set from a regex capture of the (URL-decoded) URI.
+     */
+    if (contains_header_delimiter(&context->public_dir)) {
+        ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
+            "rejecting request because the document root contains "
+            "a CR or LF character");
+        return NGX_HTTP_BAD_REQUEST;
+    }
 
     /* If there's a corresponding page cache file for this URL, then serve that
      * file instead.

data/src/ruby_supportlib/phusion_passenger/common_library.rb

@@ -345,16 +345,16 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
     source: 'ServerKit/url_parser.c',
     category: :other,
     optimize: :very_heavy
-  define_component 'ServerKit/llhttp.o',
-    source: 'ServerKit/llhttp.c',
+  define_component 'llhttp/llhttp.o',
+    source: 'vendor-copy/llhttp/llhttp.c',
     category: :other,
     optimize: :very_heavy
-  define_component 'ServerKit/llhttp_http.o',
-    source: 'ServerKit/llhttp_http.c',
+  define_component 'llhttp/llhttp_http.o',
+    source: 'vendor-copy/llhttp/http.c',
     category: :other,
     optimize: :very_heavy
-  define_component 'ServerKit/llhttp_api.o',
-    source: 'ServerKit/llhttp_api.c',
+  define_component 'llhttp/llhttp_api.o',
+    source: 'vendor-copy/llhttp/api.c',
     category: :other,
     optimize: :very_heavy
   define_component 'ServerKit/Implementation.o',

data/src/ruby_supportlib/phusion_passenger/utils/json.rb

@@ -108,7 +108,7 @@ class JSON
   end
 
   SPEC = { 'b' => "\b", 'f' => "\f", 'n' => "\n", 'r' => "\r", 't' => "\t" }
-  UNI = 'u'; CODE = /[a-fA-F0-9]{4}/
+  UNI = 'u'; CODE = /[a-fA-F0-9]{4}/; UNI_ESC = /\\u/
   STR = /"/; STE = '"'
   ESC = '\\'
 
@@ -117,7 +117,9 @@ class JSON
       str, esc = String.new, false
       while c = s.getch
         if esc
-          str << (c == UNI ? (s.scan(CODE) || error).to_i(16).chr : SPEC[c] || c)
+          # Give decoded characters the input's encoding, so that an escaped
+          # character yields the same string as the raw character would.
+          str << (c == UNI ? unicode_escape.force_encoding(c.encoding) : SPEC[c] || c)
           esc = false
         else
           case c
@@ -131,6 +133,27 @@ class JSON
     end
   end
 
+  # Decodes a \uXXXX escape (whose "\u" has already been consumed) into a
+  # UTF-8 string. Characters outside the Basic Multilingual Plane, such as
+  # emoji, are escaped as a UTF-16 surrogate pair (e.g. \uD83D\uDE00), which
+  # is combined into a single character here.
+  def unicode_escape
+    code = hex_code
+    if code.between?(0xD800, 0xDBFF)
+      scan(UNI_ESC) || error
+      low = hex_code
+      error unless low.between?(0xDC00, 0xDFFF)
+      code = 0x10000 + ((code - 0xD800) << 10) + (low - 0xDC00)
+    elsif code.between?(0xDC00, 0xDFFF)
+      error
+    end
+    [code].pack('U')
+  end
+
+  def hex_code
+    (scan(CODE) || error).to_i(16)
+  end
+
   def error
     raise "parse error at: #{scan(/.{1,20}/m).inspect}"
   end

data/src/ruby_supportlib/phusion_passenger/vendor/daemon_controller.rb

@@ -707,13 +707,24 @@ class DaemonController
           raise Errno::ECONNREFUSED
         end
       end
-      true
+      socket_connected?(socket)
     rescue Errno::ECONNREFUSED, Errno::ENOENT
       false
     ensure
       socket.close if socket
     end
 
+    # Some macOS systems (seen on CI runners in 2026) report a nonblocking
+    # connect to a closed TCP port as successful, so ping_socket confirms the
+    # connection by asking for the peer address. macOS fails that call with
+    # EINVAL instead of ENOTCONN when the connection attempt has failed.
+    def socket_connected?(socket)
+      socket.getpeername
+      true
+    rescue Errno::ENOTCONN, Errno::EINVAL
+      false
+    end
+
     def ping_tcp_socket(sockaddr)
       ping_socket(Socket::Constants::AF_INET, sockaddr)
     rescue Errno::EAFNOSUPPORT

data/src/ruby_supportlib/phusion_passenger.rb

@@ -33,7 +33,7 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h configkit_schemas_inline_comments' after changing this number.
-  VERSION_STRING = '6.2.1'
+  VERSION_STRING = '6.2.2'
 
   # Tip: find the SHA-256 with ./dev/nginx_version_sha256 <VERSION>
   PREFERRED_NGINX_VERSION = '1.30.6'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 6.2.1
+  version: 6.2.2
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-10-18 00:00:00.000000000 Z
+date: 2026-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -501,10 +501,6 @@ files:
 - src/cxx_supportlib/ServerKit/Implementation.cpp
 - src/cxx_supportlib/ServerKit/Server.h
 - src/cxx_supportlib/ServerKit/llerrors.h
-- src/cxx_supportlib/ServerKit/llhttp.c
-- src/cxx_supportlib/ServerKit/llhttp.h
-- src/cxx_supportlib/ServerKit/llhttp_api.c
-- src/cxx_supportlib/ServerKit/llhttp_http.c
 - src/cxx_supportlib/ServerKit/llversion.h
 - src/cxx_supportlib/ServerKit/url_parser.c
 - src/cxx_supportlib/ServerKit/url_parser.h
@@ -688,6 +684,10 @@ files:
 - src/cxx_supportlib/vendor-copy/libuv/src/uv-data-getter-setters.c
 - src/cxx_supportlib/vendor-copy/libuv/src/version.c
 - src/cxx_supportlib/vendor-copy/libuv/tsansupp.txt
+- src/cxx_supportlib/vendor-copy/llhttp/api.c
+- src/cxx_supportlib/vendor-copy/llhttp/http.c
+- src/cxx_supportlib/vendor-copy/llhttp/llhttp.c
+- src/cxx_supportlib/vendor-copy/llhttp/llhttp.h
 - src/cxx_supportlib/vendor-copy/utf8.h
 - src/cxx_supportlib/vendor-copy/utf8/checked.h
 - src/cxx_supportlib/vendor-copy/utf8/core.h
@@ -1049,11 +1049,13 @@ files:
 - src/cxx_supportlib/vendor-modified/boost/container/detail/addressof.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/advanced_insert_int.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/algorithm.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/detail/aligned_allocation.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/alloc_helpers.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/alloc_lib.h
 - src/cxx_supportlib/vendor-modified/boost/container/detail/allocation_type.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/allocator_version_traits.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/auto_link.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/detail/bit_utilities.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/block_list.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/block_slist.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/compare_functors.hpp
@@ -1063,12 +1065,14 @@ files:
 - src/cxx_supportlib/vendor-modified/boost/container/detail/container_or_allocator_rebind.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/container_rebind.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/copy_move_algo.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/detail/deque_impl.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/destroyers.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/dispatch_uses_allocator.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/dlmalloc.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/flat_tree.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/function_detector.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/guards_dended.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/detail/is_constructible.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/is_container.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/is_contiguous_container.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/is_pair.hpp
@@ -1093,6 +1097,7 @@ files:
 - src/cxx_supportlib/vendor-modified/boost/container/detail/pool_common.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/pool_common_alloc.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/pool_resource.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/detail/range_utils.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/singleton.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/std_fwd.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/thread_mutex.hpp
@@ -1105,8 +1110,58 @@ files:
 - src/cxx_supportlib/vendor-modified/boost/container/detail/version_type.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/detail/workaround.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/devector.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/nest.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/pmr/nest.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_all_of.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_any_of.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_copy.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_copy_if.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_copy_n.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_count.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_count_if.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_equal.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_fill.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_fill_n.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_find.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_find_if.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_find_if_not.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_find_last.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_find_last_if.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_find_last_if_not.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_for_each.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_generate.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_generate_n.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_is_partitioned.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_is_sorted.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_is_sorted_until.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_iterator_traits.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_merge.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_mismatch.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_none_of.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_partition.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_partition_copy.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_partition_point.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_remove.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_remove_copy.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_remove_copy_if.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_remove_if.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_replace.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_replace_if.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_reverse.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_reverse_copy.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_search.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_search_n.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_set_difference.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_set_intersection.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_set_symmetric_difference.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_set_union.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_stable_partition.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_swap_ranges.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/segmented_transform.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/experimental/wrapped_iterator.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/flat_map.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/flat_set.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/hub.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/list.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/map.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/new_allocator.hpp
@@ -1118,6 +1173,7 @@ files:
 - src/cxx_supportlib/vendor-modified/boost/container/pmr/flat_map.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/pmr/flat_set.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/pmr/global_resource.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/pmr/hub.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/pmr/list.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/pmr/map.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/pmr/memory_resource.hpp
@@ -1125,6 +1181,7 @@ files:
 - src/cxx_supportlib/vendor-modified/boost/container/pmr/polymorphic_allocator.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/pmr/pool_options.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/pmr/resource_adaptor.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/pmr/segtor.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/pmr/set.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/pmr/slist.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/pmr/small_vector.hpp
@@ -1135,6 +1192,7 @@ files:
 - src/cxx_supportlib/vendor-modified/boost/container/pmr/vector.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/scoped_allocator.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/scoped_allocator_fwd.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/segtor.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/set.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/slist.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/small_vector.hpp
@@ -1143,6 +1201,7 @@ files:
 - src/cxx_supportlib/vendor-modified/boost/container/string.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/throw_exception.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/uses_allocator.hpp
+- src/cxx_supportlib/vendor-modified/boost/container/uses_allocator_construction.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/uses_allocator_fwd.hpp
 - src/cxx_supportlib/vendor-modified/boost/container/vector.hpp
 - src/cxx_supportlib/vendor-modified/boost/container_hash/detail/hash_integral.hpp
@@ -1333,12 +1392,12 @@ files:
 - src/cxx_supportlib/vendor-modified/boost/describe/modifiers.hpp
 - src/cxx_supportlib/vendor-modified/boost/detail/basic_pointerbuf.hpp
 - src/cxx_supportlib/vendor-modified/boost/detail/fenv.hpp
-- src/cxx_supportlib/vendor-modified/boost/detail/lcast_precision.hpp
 - src/cxx_supportlib/vendor-modified/boost/detail/reference_content.hpp
 - src/cxx_supportlib/vendor-modified/boost/detail/workaround.hpp
 - src/cxx_supportlib/vendor-modified/boost/enable_shared_from_this.hpp
 - src/cxx_supportlib/vendor-modified/boost/exception/current_exception_cast.hpp
 - src/cxx_supportlib/vendor-modified/boost/exception/detail/clone_current_exception.hpp
+- src/cxx_supportlib/vendor-modified/boost/exception/detail/encoder.hpp
 - src/cxx_supportlib/vendor-modified/boost/exception/detail/error_info_impl.hpp
 - src/cxx_supportlib/vendor-modified/boost/exception/detail/exception_ptr.hpp
 - src/cxx_supportlib/vendor-modified/boost/exception/detail/is_output_streamable.hpp
@@ -1513,6 +1572,7 @@ files:
 - src/cxx_supportlib/vendor-modified/boost/lexical_cast.hpp
 - src/cxx_supportlib/vendor-modified/boost/lexical_cast/bad_lexical_cast.hpp
 - src/cxx_supportlib/vendor-modified/boost/lexical_cast/detail/buffer_view.hpp
+- src/cxx_supportlib/vendor-modified/boost/lexical_cast/detail/config.hpp
 - src/cxx_supportlib/vendor-modified/boost/lexical_cast/detail/converter_lexical.hpp
 - src/cxx_supportlib/vendor-modified/boost/lexical_cast/detail/converter_lexical_streams.hpp
 - src/cxx_supportlib/vendor-modified/boost/lexical_cast/detail/converter_numeric.hpp
@@ -1520,6 +1580,7 @@ files:
 - src/cxx_supportlib/vendor-modified/boost/lexical_cast/detail/is_character.hpp
 - src/cxx_supportlib/vendor-modified/boost/lexical_cast/detail/lcast_basic_unlockedbuf.hpp
 - src/cxx_supportlib/vendor-modified/boost/lexical_cast/detail/lcast_char_constants.hpp
+- src/cxx_supportlib/vendor-modified/boost/lexical_cast/detail/lcast_precision.hpp
 - src/cxx_supportlib/vendor-modified/boost/lexical_cast/detail/lcast_unsigned_converters.hpp
 - src/cxx_supportlib/vendor-modified/boost/lexical_cast/detail/type_traits.hpp
 - src/cxx_supportlib/vendor-modified/boost/lexical_cast/detail/widest_char.hpp
@@ -2691,14 +2752,17 @@ files:
 - src/cxx_supportlib/vendor-modified/boost/optional/bad_optional_access.hpp
 - src/cxx_supportlib/vendor-modified/boost/optional/detail/experimental_traits.hpp
 - src/cxx_supportlib/vendor-modified/boost/optional/detail/optional_aligned_storage.hpp
+- src/cxx_supportlib/vendor-modified/boost/optional/detail/optional_common_defs.hpp
 - src/cxx_supportlib/vendor-modified/boost/optional/detail/optional_config.hpp
 - src/cxx_supportlib/vendor-modified/boost/optional/detail/optional_factory_support.hpp
 - src/cxx_supportlib/vendor-modified/boost/optional/detail/optional_hash.hpp
+- src/cxx_supportlib/vendor-modified/boost/optional/detail/optional_nonmember_interface.hpp
 - src/cxx_supportlib/vendor-modified/boost/optional/detail/optional_reference_spec.hpp
 - src/cxx_supportlib/vendor-modified/boost/optional/detail/optional_relops.hpp
+- src/cxx_supportlib/vendor-modified/boost/optional/detail/optional_select_implementation.hpp
 - src/cxx_supportlib/vendor-modified/boost/optional/detail/optional_swap.hpp
 - src/cxx_supportlib/vendor-modified/boost/optional/detail/optional_trivially_copyable_base.hpp
-- src/cxx_supportlib/vendor-modified/boost/optional/detail/optional_utility.hpp
+- src/cxx_supportlib/vendor-modified/boost/optional/detail/union_optional.hpp
 - src/cxx_supportlib/vendor-modified/boost/optional/optional.hpp
 - src/cxx_supportlib/vendor-modified/boost/optional/optional_fwd.hpp
 - src/cxx_supportlib/vendor-modified/boost/optional/optional_io.hpp
@@ -4045,6 +4109,7 @@ files:
 - src/cxx_supportlib/vendor-modified/boost/unordered/detail/narrow_cast.hpp
 - src/cxx_supportlib/vendor-modified/boost/unordered/detail/opt_storage.hpp
 - src/cxx_supportlib/vendor-modified/boost/unordered/detail/prime_fmod.hpp
+- src/cxx_supportlib/vendor-modified/boost/unordered/detail/ranges_support.hpp
 - src/cxx_supportlib/vendor-modified/boost/unordered/detail/serialization_version.hpp
 - src/cxx_supportlib/vendor-modified/boost/unordered/detail/serialize_container.hpp
 - src/cxx_supportlib/vendor-modified/boost/unordered/detail/serialize_fca_container.hpp

data/src/cxx_supportlib/vendor-modified/boost/optional/detail/optional_utility.hpp

@@ -1,41 +0,0 @@
-// Copyright (C) 2024 Ryan Malcolm Underwood.
-//
-// Use, modification, and distribution is subject to 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)
-//
-// See http://www.boost.org/libs/optional for documentation.
-//
-// You are welcome to contact the author at:
-//  typenametea@gmail.com
-
-#ifndef BOOST_OPTIONAL_OPTIONAL_DETAIL_OPTIONAL_UTILITY_RMU_06OCT2024_HPP
-#define BOOST_OPTIONAL_OPTIONAL_DETAIL_OPTIONAL_UTILITY_RMU_06OCT2024_HPP
-
-namespace boost {
-namespace optional_detail {
-
-// Workaround: forward and move aren't constexpr in C++11
-template <class T>
-inline constexpr T&& forward(typename boost::remove_reference<T>::type& t) noexcept
-{
-  return static_cast<T&&>(t);
-}
-
-template <class T>
-inline constexpr T&& forward(typename boost::remove_reference<T>::type&& t) noexcept
-{
-  static_assert(!boost::is_lvalue_reference<T>::value, "Can not forward an rvalue as an lvalue.");
-  return static_cast<T&&>(t);
-}
-
-template <class T>
-inline constexpr typename boost::remove_reference<T>::type&& move(T&& t) noexcept
-{
-  return static_cast<typename boost::remove_reference<T>::type&&>(t);
-}
-
-} // namespace optional_detail
-} // namespace boost
-
-#endif