passenger 6.0.7 → 6.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5bed57f29715aa183e879b4f8ff0606e510f5d4
-  data.tar.gz: b970598c5d2970d0d95be66917b9c00992477339
+  metadata.gz: 76fff612d535f2e68d251bf4911e80c690901bea
+  data.tar.gz: 83758cb887cba27cea75e0efc68160e9e59ee9c1
 SHA512:
-  metadata.gz: a84cbe0a43944e25b8c3b18342402e445f4654f787d98cfa701e03f8c027990ef68dbaab2fda87d68eefe0b3777ef1f2c1171efa5966a41417ddaaf91b3dad3b
-  data.tar.gz: 34905738ff424b9c60a5993f2dd4d60374b1835b6cd34c44eeb70c14d1b2e8d0c74f77a24ce47515e419825b31ffc6178a3a133c7724d3ee4fb08acfd2d8ba50
+  metadata.gz: 243a091f1776a5422254eb7e5258a581257c6bcd7996823a094fffcdbac561f5d188174bc1dbec200cd09ddfcc270c0215bb538c542ff0f32cd95ca3ca4da340
+  data.tar.gz: 3490862543d1cda081c3b5fb6c808107750a3cc5395a1078ae4edb6487d27e99340711c460a1f61e448886c7095287d2b5c9100956523e701658c8199774d628

data/CHANGELOG

@@ -1,3 +1,97 @@
+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.
+ * [Nginx] The preferred PCRE version is now 8.45 (previously 8.44).
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+    - cmake 3.20.3 → 3.20.5
+    - git 2.31.1 → 2.32.0
+    - libksba 1.5.1 → 1.6.0
+    - 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.
+ * Make building on Apple Silcon using homebrew openssl work. Contributed by TheBerg.
+ * Add Support for Ubuntu Hirsute.
+ * Remove prebuilt packages for Ubuntu Groovy.
+ * Properly support HTTP 418. Contributed by Thomas Pfister.
+ * Fix several C++ warnings about implicit copy operators/constructors.
+ * Bump preferred nginx 1.18.0 → 1.20.1.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+    - ccache 4.2 → 4.3
+    - cmake 3.19.7 → 3.20.3
+    - curl 7.75.0 → 7.77.0
+    - git 2.31.0 → 2.31.1
+    - gnupg 2.2.27 → 2.3.1
+    - libgcrypt 1.9.2 → 1.9.3
+    - libksba 1.5.0 → 1.5.1
+    - ntbTLS added → 0.2.0
+    - zlib 1.4.9 → 1.5.0
+    - rubygems 3.2.15 → 3.2.19
+    - ruby:
+      - 2.3.8 → removed
+      - 2.5.8 → 2.5.9
+      - 2.6.6 → 2.6.7
+      - 2.7.2 → 2.7.3
+      - 3.0.0 → 3.0.1
+
+
+Release 6.0.8
+-------------
+ * [Apache] Fixes crash when restarting Apache on CentOS 8. Closes GH-2318.
+ * [Standalone] fix abort websockets on shutdown. Closes GH-2211.
+ * Fixes application process titles. They are now properly set to something like "Passenger RubyApp: ..." instead of "Passenger AppPreloader: ... (forking)".
+ * Upgrades Boost to 1.74.
+ * Allow passenger-status to detect passenger instance registry dir when systemd PrivateTmp dir is in use.
+ * Reduce the likelihood of a crash when using systemd PrivateTmp dir with Apache.
+ * Removed CentOS 6, and Debian Jessie prebuilt binaries and packages. Both are EOL.
+ * No-longer build 32 bit prebuilt binaries, as HBB dropped support.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+    - ccache_version: 4.0 → 4.2
+    - cmake_version: 3.18.4 → 3.19.7
+    - curl_version: 7.73.0 → 7.75.0
+    - git_version: 2.29.1 → 2.31.0
+    - gnupg_version: 2.2.23 → 2.2.27
+    - libassuan_version: 2.5.4 → 2.5.5
+    - libgcrypt_version: 1.8.7 → 1.9.2
+    - libgpg_error_version: 1.39 → 1.42
+    - libksba_version: 1.4.0 → 1.5.0
+    - openssl_version: 1.1.1h → 1.1.1k
+    - pinentry_version: 1.1.0 → 1.1.1
+    - rubygems_version: 3.1.4 → 3.2.15
+    - zstd_version: 1.4.5 → 1.4.9
+    - ruby_versions + 3.0.0
+
+
 Release 6.0.7
 -------------
  * Addresses regression introduced in 6.0.5 when attempting to establish database connection after fork and activerecord is not configured in the expected way. Closes GH-2281.
@@ -24,6 +118,7 @@ Release 6.0.7
     - libgcrypt 1.8.7 (was 1.8.6)
     - OpenSSL 1.1.1h (was 1.0.2u)
 
+
 Release 6.0.6
 -------------
  * Update gemspec with up to date metadata.

data/CONTRIBUTORS

@@ -1,4 +1,5 @@
 _why
+A compound of Fe and O
 Adam Duke
 Alessandro Lenzen
 Alex Osborne
@@ -10,6 +11,7 @@ Andrei Belov
 Andy Allan
 Benjamin Fleischer
 Bernd Ahlers
+Bernhard M. Wiedemann
 Camden Narzt (Phusion)
 Chad Fowler
 Chris Walquist
@@ -50,10 +52,12 @@ Jacob Elder
 Jacob Harris
 James Miller
 Jan Berkel
+Janko Marohnić
 Jason Cannon
 jastix
 Jay Freeman (saurik)
 jbergler
+Jia L
 John Dewey
 John Leach
 Joshua Lund
@@ -106,6 +110,9 @@ Sebastian Welther
 Slippy Douglas
 Stephen Bannasch
 Steven Chamberlain
+Taketo Takashima
+TheBerg
+Thomas Pfister
 Tim Bishop
 Tim Carey-Smith
 Tinco Andringa (Phusion)

data/README.md

@@ -1,20 +1,13 @@
 [![Gem Version](https://badge.fury.io/rb/passenger.svg)](https://badge.fury.io/rb/passenger)
-# <img src="images/passenger_logo.svg" alt="passenger logo" style="margin-bottom: -.2em; width: 1.4em"> Phusion Passenger
+# <img src="images/passenger_logo.svg" alt="passenger logo" style="margin-bottom: -.2em; width: 1.4em"> Phusion Passenger®
 <h3>Supercharge your Ruby, Node.js and Python apps</h3>
 
-[Phusion Passenger™](https://www.phusionpassenger.com/) is a web server and application server, designed to be fast, robust and lightweight. It takes a lot of complexity out of deploying web apps, adds powerful enterprise-grade features that are useful in production, and makes administration much easier and less complex. Phusion Passenger supports Ruby, Python, Node.js and Meteor, and is being used by high-profile companies such as **Apple, Pixar, New York Times, AirBnB, Juniper** etc as well as [over 650.000 websites](http://trends.builtwith.com/Web-Server/Phusion-Passenger).
+[Phusion Passenger®](https://www.phusionpassenger.com/) is a web server and application server, designed to be fast, robust and lightweight. It takes a lot of complexity out of deploying web apps, adds powerful enterprise-grade features that are useful in production, and makes administration much easier and less complex. Phusion Passenger supports Ruby, Python, Node.js and Meteor, and is being used by high-profile companies such as **Apple, Pixar, New York Times, AirBnB, Juniper** etc as well as [over 650.000 websites](http://trends.builtwith.com/Web-Server/Phusion-Passenger).
 
 <a href="https://vimeo.com/224923750"><img src="https://github.com/phusion/passenger/blob/stable-5.2/images/justin.png" height="400"></a><br><em>Phusion Passenger - the smart app server</em>
 
 <p>What makes Passenger so fast and reliable is its <strong>C++</strong> core, its <strong>zero-copy</strong> architecture, its <strong>watchdog</strong> system and its <strong>hybrid</strong> evented, multi-threaded and multi-process design.</p>
 
-## Fuse Panel - GUI for Passenger
-The <strong>smarter</strong> and <strong>simpler command center</strong> for your applications. <strong><a href="https://www.phusionpassenger.com/fuse-panel" target="_blank">Fuse Panel</a></strong> monitors your apps in near real-time, offers insights in your logs and enables analyzing and troubleshooting issues. New and exclusively available in the Fuse Panel is much-requested feature <strong>per-application log viewing and splitting</strong>.
-
-Regardless of if you’re running Passenger open source or you’re one of our enterprise customers, the Fuse Panel is available for free while in beta. <a href="https://www.phusionpassenger.com/fuse-panel" target="_blank">Give it a try</a>.
-
-<img src="https://github.com/phusion/passenger/blob/stable-5.2/images/spark.png" align="left" width="300">
-
 ### Learn more:
 - [Website](https://www.phusionpassenger.com/)
 - [Fuse Panel](https://www.phusionpassenger.com/fuse-panel)

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

@@ -46,7 +46,7 @@ def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags = nil)
 
   # Define compilation targets for .cpp files in src/cxx_supportlib/vendor-modified/boost/src/pthread.
   boost_object_files = []
-  Dir['src/cxx_supportlib/vendor-modified/boost/libs/**/*.cpp'].each do |source_file|
+  Dir['src/cxx_supportlib/vendor-modified/boost/libs/**/*.cpp'].sort.each do |source_file|
     object_name = File.basename(source_file.sub(/\.cpp$/, '.o'))
     boost_output_dir  = "#{output_dir}/boost"
     object_file = "#{boost_output_dir}/#{object_name}"
@@ -64,7 +64,7 @@ def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags = nil)
 
   # Define compilation targets for .cpp files in src/cxx_supportlib/oxt.
   oxt_object_files = []
-  Dir['src/cxx_supportlib/oxt/*.cpp'].each do |source_file|
+  Dir['src/cxx_supportlib/oxt/*.cpp'].sort.each do |source_file|
     object_name = File.basename(source_file.sub(/\.cpp$/, '.o'))
     oxt_output_dir  = "#{output_dir}/oxt"
     object_file = "#{oxt_output_dir}/#{object_name}"
@@ -145,7 +145,7 @@ if USE_VENDORED_LIBEV
       "CC='#{cc_command}' CXX='#{cxx_command}' CFLAGS='#{cflags}' orig_CFLAGS=1"
   end
 
-  libev_sources = Dir["src/cxx_supportlib/vendor-modified/libev/{*.c,*.h}"]
+  libev_sources = Dir["src/cxx_supportlib/vendor-modified/libev/{*.c,*.h}"].sort
   file LIBEV_OUTPUT_DIR + ".libs/libev.a" => [LIBEV_OUTPUT_DIR + "Makefile"] + libev_sources do
     sh "rm -f #{LIBEV_OUTPUT_DIR}libev.la"
     sh "cd #{LIBEV_OUTPUT_DIR} && make libev.la V=1"
@@ -218,7 +218,7 @@ if USE_VENDORED_LIBUV
       "CC='#{cc_command}' CXX='#{cxx_command}' CFLAGS='#{cflags}'"
   end
 
-  libuv_sources = Dir["src/cxx_supportlib/vendor-copy/libuv/**/{*.c,*.h}"]
+  libuv_sources = Dir["src/cxx_supportlib/vendor-copy/libuv/**/{*.c,*.h}"].sort
   file LIBUV_OUTPUT_DIR + ".libs/libuv.a" => [LIBUV_OUTPUT_DIR + "Makefile"] + libuv_sources do
     sh "rm -f #{LIBUV_OUTPUT_DIR}/libuv.la"
     sh "cd #{LIBUV_OUTPUT_DIR} && make -j2 libuv.la V=1"
@@ -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/build/packaging.rb

@@ -22,6 +22,8 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+homebrew_contents = "Homebrew recently banned empty files, so enjoy wasting some disk space for them"
+
 def recursive_copy_files(files, destination_dir, preprocess = false, variables = {})
   if !STDOUT.tty?
     puts "Copying files..."
@@ -69,7 +71,7 @@ task 'package:gem' => PhusionPassenger::Packaging::PREGENERATED_FILES do
   end
   begin
     if release_file
-      File.open(release_file, "w").close
+      File.write(release_file, homebrew_contents)
     end
     sh("gem build #{PhusionPassenger::PACKAGE_NAME}.gemspec")
   ensure
@@ -87,7 +89,7 @@ task 'package:tarball' => PhusionPassenger::Packaging::PREGENERATED_FILES do
   sh "mkdir -p #{PKG_DIR}/#{basename}"
   recursive_copy_files(PhusionPassenger::Packaging.files, "#{PKG_DIR}/#{basename}")
   if ENV['OFFICIAL_RELEASE']
-    File.open("#{PKG_DIR}/#{basename}/resources/release.txt", "w").close
+    File.write("#{PKG_DIR}/#{basename}/resources/release.txt", homebrew_contents)
   end
   if PlatformInfo.os_name_simple == "macosx"
     sh "cd #{PKG_DIR}/#{basename} && find . -print0 | xargs -0 touch -t '201310270000'"

data/build/support/cxx_dependency_map.rb

@@ -10069,6 +10069,7 @@ CXX_DEPENDENCY_MAP =
  "src/cxx_supportlib/SystemTools/ContainerHelpers.h"=>
   ["src/cxx_supportlib/FileTools/FileManip.h",
    "src/cxx_supportlib/StaticString.h",
+   "src/cxx_supportlib/StrIntTools/StrIntUtils.h",
    "src/cxx_supportlib/oxt/macros.hpp"],
  "src/cxx_supportlib/SystemTools/ProcessMetricsCollector.h"=>
   ["src/cxx_supportlib/Algorithms/Hasher.h",

data/dev/copy_boost_headers

@@ -97,7 +97,7 @@ PROGRAM_SOURCE = %q{
   #include <boost/thread.hpp>
   #include <boost/noncopyable.hpp>
   #include <boost/function.hpp>
-  #include <boost/bind.hpp>
+  #include <boost/bind/bind.hpp>
   #include <boost/container/vector.hpp>
   #include <boost/date_time/posix_time/posix_time.hpp>
   #include <boost/foreach.hpp>
@@ -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/resources/release.txt

@@ -0,0 +1 @@
+Homebrew recently banned empty files, so enjoy wasting some disk space for them

data/resources/templates/config/installation_utils/user_support_binaries_dir_not_writable.txt.erb

@@ -0,0 +1 @@
+<%# Homebrew recently banned empty files, so enjoy wasting some disk space for them %>

data/resources/templates/standalone/global.erb

@@ -4,6 +4,10 @@ daemon on;
 error_log '<%= @options[:log_file] %>' <% if @options[:log_level] >= LVL_DEBUG %>info<% end %>;
 pid '<%= @options[:pid_file] %>';
 
+<% if @options[:abort_websockets_on_process_shutdown].nil? || @options[:abort_websockets_on_process_shutdown] %>
+worker_shutdown_timeout 10;
+<% end %>
+
 <% if Process.euid == 0 %>
     <% if @options[:user] %>
         <%# Run workers as the given user. The master process will always run as root and will be able to bind to any port. %>

data/src/agent/Core/AdminPanelConnector.h

@@ -32,7 +32,7 @@
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/thread.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/foreach.hpp>
 
 #include <limits>

data/src/agent/Core/ApplicationPool/Group/InternalUtils.cpp

@@ -115,13 +115,13 @@ Group::prepareHookScriptOptions(HookScriptOptions &hsOptions, const char *name)
 void
 Group::runAttachHooks(const ProcessPtr process) const {
 	getPool()->runHookScripts("attached_process",
-		boost::bind(&Group::setupAttachOrDetachHook, this, process, _1));
+		boost::bind(&Group::setupAttachOrDetachHook, this, process, boost::placeholders::_1));
 }
 
 void
 Group::runDetachHooks(const ProcessPtr process) const {
 	getPool()->runHookScripts("detached_process",
-		boost::bind(&Group::setupAttachOrDetachHook, this, process, _1));
+		boost::bind(&Group::setupAttachOrDetachHook, this, process, boost::placeholders::_1));
 }
 
 void

data/src/agent/Core/ApplicationPool/Group/OutOfBandWork.cpp

@@ -138,7 +138,7 @@ Group::initiateOobw(const ProcessPtr &process) {
 		P_DEBUG("Disabling process " << process->inspect() << " in preparation for OOBW");
 		DisableResult result = disable(process,
 			boost::bind(&Group::lockAndMaybeInitiateOobw, this,
-				_1, _2, shared_from_this()));
+				boost::placeholders::_1, boost::placeholders::_2, shared_from_this()));
 		switch (result) {
 		case DR_SUCCESS:
 			// Continue code flow.

data/src/agent/Core/ApplicationPool/Group.h

@@ -31,7 +31,7 @@
 #include <queue>
 #include <deque>
 #include <boost/thread.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/foreach.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>

data/src/agent/Core/ApplicationPool/Options.h

@@ -671,9 +671,9 @@ public:
 	StaticString getProcessTitle(const WrapperRegistry::Registry &registry) const {
 		const WrapperRegistry::Entry &entry = registry.lookup(appType);
 		if (entry.isNull()) {
-			return entry.processTitle;
-		} else {
 			return StaticString();
+		} else {
+			return entry.processTitle;
 		}
 	}
 

data/src/agent/Core/ApplicationPool/Pool/ProcessUtils.cpp

@@ -308,7 +308,7 @@ Pool::disableProcess(const StaticString &gupid) {
 		// Must be a boost::shared_ptr to be interruption-safe.
 		boost::shared_ptr<DisableWaitTicket> ticket = boost::make_shared<DisableWaitTicket>();
 		DisableResult result = group->disable(process,
-			boost::bind(syncDisableProcessCallback, _1, _2, ticket));
+			boost::bind(syncDisableProcessCallback, boost::placeholders::_1, boost::placeholders::_2, ticket));
 		group->verifyInvariants();
 		group->verifyExpensiveInvariants();
 		if (result == DR_DEFERRED) {

data/src/agent/Core/ApplicationPool/Pool.h

@@ -33,7 +33,7 @@
 #include <sstream>
 #include <iomanip>
 #include <boost/thread.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/function.hpp>

data/src/agent/Core/Config.h

@@ -30,7 +30,7 @@
 #include <string>
 #include <vector>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/foreach.hpp>
 
 #include <LoggingKit/LoggingKit.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.7")
+ *   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

@@ -26,7 +26,7 @@
 #ifndef _PASSENGER_CORE_CONTROLLER_CONFIG_H_
 #define _PASSENGER_CORE_CONTROLLER_CONFIG_H_
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/smart_ptr/intrusive_ref_counter.hpp>
 #include <string.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.7")
+ *   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/Core/SpawningKit/Handshake/BackgroundIOCapturer.h

@@ -27,7 +27,7 @@
 #define _PASSENGER_SPAWNING_KIT_BACKGROUND_IO_CAPTURER_H_
 
 #include <boost/thread.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/function.hpp>
 #include <boost/foreach.hpp>
 #include <oxt/backtrace.hpp>

data/src/agent/Core/SpawningKit/Handshake/Perform.h

@@ -28,7 +28,7 @@
 
 #include <boost/thread.hpp>
 #include <boost/make_shared.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <oxt/thread.hpp>
 #include <oxt/system_calls.hpp>
 #include <oxt/backtrace.hpp>

data/src/agent/Core/SpawningKit/PipeWatcher.h

@@ -30,7 +30,7 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/thread.hpp>
 #include <boost/function.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/foreach.hpp>
 #include <oxt/thread.hpp>
 #include <oxt/backtrace.hpp>

data/src/agent/Core/SpawningKit/SmartSpawner.h

@@ -28,7 +28,7 @@
 
 #include <oxt/thread.hpp>
 #include <oxt/system_calls.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/make_shared.hpp>
 #include <string>
 #include <vector>

data/src/agent/Core/SpawningKit/Spawner.h

@@ -117,6 +117,7 @@ protected:
 		config->loadShellEnvvars = options.loadShellEnvvars;
 		config->startupFile = options.getStartupFile(*context->wrapperRegistry);
 		config->appType = options.appType;
+		config->processTitle = options.getProcessTitle(*context->wrapperRegistry);
 		config->appEnv = options.environment;
 		config->baseURI = options.baseURI;
 		config->environmentVariables = decodeEnvironmentVariables(

data/src/agent/Core/TelemetryCollector.h

@@ -34,7 +34,7 @@
 #include <cassert>
 
 #include <boost/cstdint.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <oxt/thread.hpp>
 #include <oxt/backtrace.hpp>
 

data/src/agent/Shared/ApiServerUtils.h

@@ -50,7 +50,7 @@
  */
 
 #include <boost/foreach.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/regex.hpp>
 #include <oxt/macros.hpp>
 #include <oxt/backtrace.hpp>

data/src/agent/Shared/ApplicationPoolApiKey.h

@@ -102,6 +102,8 @@ public:
 		memcpy(value, other.data(), SIZE);
 	}
 
+	ApiKey& operator=(const ApiKey &other) = default;
+
 	ApiKey(const ApiKey &other) {
 		memcpy(value, other.value, SIZE);
 	}

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.7")
+ *   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/agent/Watchdog/InstanceDirToucher.cpp

@@ -24,7 +24,7 @@
  *  THE SOFTWARE.
  */
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <Shared/Fundamentals/Utils.h>
 #include <Utils/AsyncSignalSafeUtils.h>
 

data/src/agent/Watchdog/WatchdogMain.cpp

@@ -29,7 +29,7 @@
 #include <oxt/thread.hpp>
 #include <oxt/system_calls.hpp>
 #include <boost/function.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/foreach.hpp>
 #include <boost/enable_shared_from_this.hpp>