passenger 6.0.10 → 6.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84d5efa4e63f666d5f40342ef5e6992487b603f1
-  data.tar.gz: 5320cb6043d4574259be0e68ea82e6809d52c16d
+  metadata.gz: 76fff612d535f2e68d251bf4911e80c690901bea
+  data.tar.gz: 83758cb887cba27cea75e0efc68160e9e59ee9c1
 SHA512:
-  metadata.gz: 1184227fb4ca333138b4ba0227d4cebec220ad677603b4a4f5d7b57c49c722bd618e3015b23ab9e2a28d122fffab1cbdb4dc42440a7c837a544450d5b7e324d2
-  data.tar.gz: 4b4145b3abb36b27a9cedcd58c35077cc63b4bc0576e028f8a5bc07052157973f6bd6ed67ff3b08bd3e3aad6cd22c7f01849b5a2cc7dc979dad5eec8fc167537
+  metadata.gz: 243a091f1776a5422254eb7e5258a581257c6bcd7996823a094fffcdbac561f5d188174bc1dbec200cd09ddfcc270c0215bb538c542ff0f32cd95ca3ca4da340
+  data.tar.gz: 3490862543d1cda081c3b5fb6c808107750a3cc5395a1078ae4edb6487d27e99340711c460a1f61e448886c7095287d2b5c9100956523e701658c8199774d628

data/CHANGELOG

@@ -1,4 +1,27 @@
-Release 6.0.10 (Not yet released)
+Release 6.0.11 (Not yet released)
+-------------
+ * 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 +34,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

@@ -110,6 +110,7 @@ Sebastian Welther
 Slippy Douglas
 Stephen Bannasch
 Steven Chamberlain
+Taketo Takashima
 TheBerg
 Thomas Pfister
 Tim Bishop

data/bin/passenger-install-nginx-module

@@ -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

@@ -230,8 +230,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",
+      ""
+    ].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/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.11")
  *   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

@@ -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.11")
  *   show_version_in_header                              boolean            -          default(true)
  *   start_reading_after_accept                          boolean            -          default(true)
  *   stat_throttle_rate                                  unsigned integer   -          default(10)

data/src/agent/Watchdog/Config.h

@@ -153,7 +153,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.11")
  *   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.10"
+#define PASSENGER_VERSION "6.0.11"
 #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/boost/smart_ptr/detail/sp_obsolete.hpp

@@ -0,0 +1,32 @@
+#ifndef BOOST_SMART_PTR_DETAIL_SP_OBSOLETE_HPP_INCLUDED
+#define BOOST_SMART_PTR_DETAIL_SP_OBSOLETE_HPP_INCLUDED
+
+// MS compatible compilers support #pragma once
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+
+// boost/smart_ptr/detail/sp_obsolete.hpp
+//
+// Copyright 2020 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+//
+// Defines the BOOST_SP_OBSOLETE macro that emits a deprecation
+// message.
+
+#include <boost/config/pragma_message.hpp>
+
+#if !defined( BOOST_SP_NO_OBSOLETE_MESSAGE )
+
+#define BOOST_SP_OBSOLETE() BOOST_PRAGMA_MESSAGE("This platform-specific implementation is presumed obsolete and is slated for removal. If you want it retained, please open an issue in https://github.com/boostorg/smart_ptr.")
+
+#else
+
+#define BOOST_SP_OBSOLETE()
+
+#endif
+
+#endif // #ifndef BOOST_SMART_PTR_DETAIL_SP_OBSOLETE_HPP_INCLUDED

data/src/cxx_supportlib/{vendor-copy → vendor-modified}/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)

data/src/ruby_supportlib/phusion_passenger/config/nginx_engine_compiler.rb

@@ -32,6 +32,7 @@ PhusionPassenger.require_passenger_lib 'config/installation_utils'
 PhusionPassenger.require_passenger_lib 'platform_info'
 PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 PhusionPassenger.require_passenger_lib 'platform_info/openssl'
+PhusionPassenger.require_passenger_lib 'platform_info/pcre'
 PhusionPassenger.require_passenger_lib 'platform_info/compiler'
 PhusionPassenger.require_passenger_lib 'utils/shellwords'
 PhusionPassenger.require_passenger_lib 'utils/progress_bar'
@@ -44,10 +45,10 @@ module PhusionPassenger
       include InstallationUtils
 
       def self.configure_script_options
-        extra_cflags = "-Wno-error #{PlatformInfo.openssl_extra_cflags}".strip
+        extra_cflags = "-Wno-error #{PlatformInfo.openssl_extra_cflags} #{PlatformInfo.pcre_extra_cflags}".strip
         result = "--with-cc-opt=#{Shellwords.escape extra_cflags} "
 
-        extra_ldflags = PlatformInfo.openssl_extra_ldflags
+        extra_ldflags = "#{PlatformInfo.openssl_extra_ldflags} #{PlatformInfo.pcre_extra_ldflags}".strip
         if !extra_ldflags.empty?
           result << "--with-ld-opt=#{Shellwords.escape extra_ldflags} "
         end

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

@@ -64,14 +64,16 @@ module PhusionPassenger
         if RUBY_PLATFORM =~ /universal/
           ruby_arch = "universal"
         else
-          # OS X <  10.8: something like:
+          # OS X often prints something like:
           #   "/opt/ruby-enterprise/bin/ruby: Mach-O 64-bit executable x86_64"
-          output = `file -L "#{ruby_executable}"`.strip
-          ruby_arch = output.sub(/.* /, '')
+          output = `file -L "#{ruby_executable}"`.lines.first.strip
+          ruby_arch = output.split.last
           if ruby_arch == "executable"
-            # OS X >= 10.8: something like:
+            # some OS X print something like:
             #   "/opt/ruby-enterprise/bin/ruby: Mach-O 64-bit executable"
-            if output =~ /Mach-O 64-bit/
+            if output =~ /arm64/
+              ruby_arch = "arm"
+            elsif output =~ /Mach-O 64-bit/
               ruby_arch = "x86_64"
             else
               raise "Cannot autodetect the Ruby interpreter's architecture"

data/src/ruby_supportlib/phusion_passenger/platform_info/depcheck_specs/libs.rb

@@ -115,7 +115,8 @@ define 'pcre-dev' do
   name "PCRE development headers"
   website "http://www.pcre.org/"
   define_checker do
-    check_for_header('pcre.h')
+    check_for_header('pcre.h', :c,
+      PlatformInfo.pcre_extra_cflags)
   end
 
   on :debian do
@@ -124,4 +125,7 @@ define 'pcre-dev' do
   on :redhat do
     yum_install 'pcre-devel'
   end
-end
+  on :macosx do
+    brew_install "pcre"
+  end
+end

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

@@ -87,7 +87,7 @@ module PhusionPassenger
         data = read_file('/etc/centos-release')
         data = read_file('/etc/redhat-release') if data.empty?
         if !data.empty?
-          data =~ /^(.+?) (Linux )?(release |version )?(.+?)( |$)/i
+          data =~ /^(.+?) (Linux |Stream )?(release |version )?(.+?)( |$)/i
           return VersionComparer.new($4) if $4
         end
 
@@ -160,8 +160,14 @@ module PhusionPassenger
         # from 10.15 on x86 was dropped, and from (11/10.16) on arm (aarch64) was added.
         major, minor, *rest = os_version.split(".").map(&:to_i)
         if major >= 11 || (major == 10 && minor >= 16)
-          # Since Big Sur aarch64 is supported.
-          ["x86_64", "arm"]
+          # Since Big Sur aarch64 is supported, and default on m1 macs.
+          if `uname -m` =~ /arm64/
+            ["arm", "x86_64"]
+          elsif `sysctl -in sysctl.proc_translated` == "1"
+            ["arm", "x86_64"]
+          else
+            ["x86_64", "arm"]
+          end
         elsif minor == 15
           # Since Catalina x86 is gone.
           ["x86_64"]

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

@@ -0,0 +1,65 @@
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2021 Phusion Holding B.V.
+#
+#  "Passenger", "Phusion Passenger" and "Union Station" are registered
+#  trademarks of Phusion Holding B.V.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
+PhusionPassenger.require_passenger_lib 'platform_info'
+PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
+
+module PhusionPassenger
+
+  module PlatformInfo
+    def self.pcre_extra_cflags
+      if PlatformInfo.os_name_simple == "macosx"
+        if File.exist?("/usr/local/opt/pcre/include")
+          # Use the one from Homebrew.
+          "-I/usr/local/opt/pcre/include"
+        elsif File.exist?("/opt/homebrew/opt/pcre/include")
+          # Use the one from Homebrew on Apple Silicon
+          "-I/opt/homebrew/opt/pcre/include"
+        else
+          # Use the one from Macports.
+          "-I/opt/local/include"
+        end
+      else
+        ""
+      end
+    end
+    memoize :pcre_extra_cflags
+
+    def self.pcre_extra_ldflags
+      if PlatformInfo.os_name_simple == "macosx"
+        if File.exist?("/usr/local/opt/pcre/include")
+          "-L/usr/local/opt/pcre/lib"
+        elsif File.exist?("/opt/homebrew/opt/pcre/include")
+          "-L/opt/homebrew/opt/pcre/include"
+        else
+          "-L/opt/local/lib"
+        end
+      else
+        ""
+      end
+    end
+    memoize :pcre_extra_ldflags
+  end
+
+end # module PhusionPassenger

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.10'
+  VERSION_STRING = '6.0.11'
 
   # Tip: find the SHA-256 with ./dev/nginx_version_sha2 <VERSION>
   PREFERRED_NGINX_VERSION = '1.20.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 6.0.10
+  version: 6.0.11
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-12 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -111,6 +111,7 @@ files:
 - dev/ruby_server.rb
 - dev/runner
 - dev/show-latest-crashlog-dir
+- dev/webpacketpp.patch
 - doc/CodingTipsAndPitfalls.md
 - doc/DebuggingAndStressTesting.md
 - doc/DeveloperQuickstart.md
@@ -621,102 +622,6 @@ files:
 - src/cxx_supportlib/vendor-copy/utf8/checked.h
 - src/cxx_supportlib/vendor-copy/utf8/core.h
 - src/cxx_supportlib/vendor-copy/utf8/unchecked.h
-- src/cxx_supportlib/vendor-copy/websocketpp/COPYING
-- src/cxx_supportlib/vendor-copy/websocketpp/changelog.md
-- src/cxx_supportlib/vendor-copy/websocketpp/readme.md
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/base64/base64.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/client.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/close.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/asio.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/asio_ssl.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/chrono.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/connection_hdl.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/cpp11.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/functional.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/md5.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/memory.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/network.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/platforms.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/random.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/regex.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/stdint.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/system_error.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/thread.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/time.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/type_traits.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/concurrency/basic.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/concurrency/none.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/config/asio.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/config/asio_client.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/config/asio_no_tls.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/config/asio_no_tls_client.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/config/boost_config.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/config/core.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/config/core_client.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/config/debug.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/config/debug_asio.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/config/debug_asio_no_tls.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/config/minimal_client.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/config/minimal_server.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/connection.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/connection_base.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/endpoint.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/endpoint_base.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/error.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/extensions/extension.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/extensions/permessage_deflate/disabled.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/extensions/permessage_deflate/enabled.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/frame.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/http/constants.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/http/impl/parser.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/http/impl/request.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/http/impl/response.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/http/parser.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/http/request.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/http/response.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/impl/connection_impl.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/impl/endpoint_impl.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/impl/utilities_impl.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/logger/basic.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/logger/levels.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/logger/stub.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/logger/syslog.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/message_buffer/alloc.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/message_buffer/message.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/message_buffer/pool.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/processors/base.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/processors/hybi00.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/processors/hybi07.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/processors/hybi08.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/processors/hybi13.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/processors/processor.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/random/none.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/random/random_device.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/roles/client_endpoint.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/roles/server_endpoint.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/server.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/sha1/sha1.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/transport/asio/base.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/transport/asio/connection.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/transport/asio/endpoint.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/transport/asio/security/base.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/transport/asio/security/none.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/transport/asio/security/tls.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/transport/base/connection.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/transport/base/endpoint.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/transport/debug/base.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/transport/debug/connection.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/transport/debug/endpoint.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/transport/iostream/base.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/transport/iostream/connection.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/transport/iostream/endpoint.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/transport/stub/base.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/transport/stub/connection.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/transport/stub/endpoint.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/uri.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/utf8_validator.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/utilities.hpp
-- src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/version.hpp
 - src/cxx_supportlib/vendor-modified/boost/algorithm/string/case_conv.hpp
 - src/cxx_supportlib/vendor-modified/boost/algorithm/string/classification.hpp
 - src/cxx_supportlib/vendor-modified/boost/algorithm/string/compare.hpp
@@ -4109,6 +4014,7 @@ files:
 - src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_has_sync_intrinsics.hpp
 - src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_noexcept.hpp
 - src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_nullptr_t.hpp
+- src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_obsolete.hpp
 - src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_thread_pause.hpp
 - src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_thread_sleep.hpp
 - src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_typeinfo_.hpp
@@ -4644,6 +4550,102 @@ files:
 - src/cxx_supportlib/vendor-modified/modp_b64_data.h
 - src/cxx_supportlib/vendor-modified/modp_b64_strict_aliasing.cpp
 - src/cxx_supportlib/vendor-modified/psg_sysqueue.h
+- src/cxx_supportlib/vendor-modified/websocketpp/COPYING
+- src/cxx_supportlib/vendor-modified/websocketpp/changelog.md
+- src/cxx_supportlib/vendor-modified/websocketpp/readme.md
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/base64/base64.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/client.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/close.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/common/asio.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/common/asio_ssl.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/common/chrono.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/common/connection_hdl.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/common/cpp11.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/common/functional.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/common/md5.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/common/memory.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/common/network.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/common/platforms.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/common/random.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/common/regex.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/common/stdint.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/common/system_error.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/common/thread.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/common/time.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/common/type_traits.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/concurrency/basic.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/concurrency/none.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/config/asio.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/config/asio_client.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/config/asio_no_tls.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/config/asio_no_tls_client.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/config/boost_config.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/config/core.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/config/core_client.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/config/debug.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/config/debug_asio.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/config/debug_asio_no_tls.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/config/minimal_client.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/config/minimal_server.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/connection.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/connection_base.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/endpoint.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/endpoint_base.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/error.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/extensions/extension.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/extensions/permessage_deflate/disabled.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/extensions/permessage_deflate/enabled.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/frame.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/http/constants.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/http/impl/parser.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/http/impl/request.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/http/impl/response.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/http/parser.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/http/request.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/http/response.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/impl/connection_impl.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/impl/endpoint_impl.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/impl/utilities_impl.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/logger/basic.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/logger/levels.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/logger/stub.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/logger/syslog.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/message_buffer/alloc.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/message_buffer/message.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/message_buffer/pool.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/processors/base.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/processors/hybi00.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/processors/hybi07.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/processors/hybi08.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/processors/hybi13.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/processors/processor.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/random/none.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/random/random_device.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/roles/client_endpoint.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/roles/server_endpoint.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/server.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/sha1/sha1.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/transport/asio/base.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/transport/asio/connection.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/transport/asio/endpoint.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/transport/asio/security/base.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/transport/asio/security/none.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/transport/asio/security/tls.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/transport/base/connection.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/transport/base/endpoint.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/transport/debug/base.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/transport/debug/connection.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/transport/debug/endpoint.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/transport/iostream/base.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/transport/iostream/connection.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/transport/iostream/endpoint.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/transport/stub/base.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/transport/stub/connection.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/transport/stub/endpoint.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/uri.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/utf8_validator.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/utilities.hpp
+- src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/version.hpp
 - src/helper-scripts/README.md
 - src/helper-scripts/backtrace-sanitizer.rb
 - src/helper-scripts/crash-watch.rb
@@ -4817,6 +4819,7 @@ files:
 - src/ruby_supportlib/phusion_passenger/platform_info/networking.rb
 - src/ruby_supportlib/phusion_passenger/platform_info/openssl.rb
 - src/ruby_supportlib/phusion_passenger/platform_info/operating_system.rb
+- src/ruby_supportlib/phusion_passenger/platform_info/pcre.rb
 - src/ruby_supportlib/phusion_passenger/platform_info/ruby.rb
 - src/ruby_supportlib/phusion_passenger/platform_info/zlib.rb
 - src/ruby_supportlib/phusion_passenger/plugin.rb