passenger 6.0.11 → 6.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76fff612d535f2e68d251bf4911e80c690901bea
-  data.tar.gz: 83758cb887cba27cea75e0efc68160e9e59ee9c1
+  metadata.gz: 536d56479491f031585ad9f7a050a49978a965be
+  data.tar.gz: 2074da45c50faf1754c190f448c8fd89bd1e0bfe
 SHA512:
-  metadata.gz: 243a091f1776a5422254eb7e5258a581257c6bcd7996823a094fffcdbac561f5d188174bc1dbec200cd09ddfcc270c0215bb538c542ff0f32cd95ca3ca4da340
-  data.tar.gz: 3490862543d1cda081c3b5fb6c808107750a3cc5395a1078ae4edb6487d27e99340711c460a1f61e448886c7095287d2b5c9100956523e701658c8199774d628
+  metadata.gz: a9c3b77e7ccf78b9018135ac0501a864c3bb2f695df9c5d3aa8510aa75fc04440ed4aaf6c9db3876fa8512965436ac5e3959dadb0905f4ca375f5830dd8c0091
+  data.tar.gz: 5e64ae1f36a459ab8661849c2c48af6fabe5a91ccb88485ecde138323686393557dde2399bfee4c2aa45e121e5cf12bb9c6f59b09e774d393b20db7803b8411c

data/CHANGELOG

@@ -1,4 +1,27 @@
-Release 6.0.11 (Not yet released)
+Release 6.0.12 (Not yet released)
+-------------
+ * [Debian] Fix compilation on 32 bit arm. Contributed by Antonio Terceiro.
+ * [Debian] Add Bullseye Debian packages.
+ * Add formatted error messages to responses. Contributed by Mohammad Aboelnour.
+ * Fixes for running under WSL 1. Contributed by Luke Pearce. Closes GH-2036.
+ * Upgrades Boost to 1.77. To go along with 32 bit arm fix.
+ * [MacOS] Fixes autodetection of openssl lib on apple silicon. Contributed by Taketo Takashima. Closes GH-2389.
+ * Reconnect to mongoid databases after fork, like we do for ActiveRecord. Contributed by Mohammad Aboelnour.
+ * [Ubuntu] add missing apache name in instance registry dir detection.
+ * [Ubuntu] replace hirsute apt packages with impish.
+ * [Nginx] add new config option to choose the status code returned when application spawning fails. (passenger_spawn_exception_status_code).
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+ - ccache: 4.4.1 → 4.4.2
+ - cmake: 3.21.2 → 3.21.4
+ - curl: 7.78.0 → 7.79.1
+ - git: 2.33.0 → 2.33.1
+ - gnupg: 2.3.2 → 2.3.3
+ - rubygems: 3.2.27 → 3.2.30
+ - s3cmd: 2.1.0 → 2.2.0
+
+
+Release 6.0.11
 -------------
  * 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.

data/CONTRIBUTORS

@@ -9,6 +9,7 @@ Andre Ferraz
 Andre Nathan
 Andrei Belov
 Andy Allan
+Antonio Terceiro
 Benjamin Fleischer
 Bernd Ahlers
 Bernhard M. Wiedemann
@@ -64,6 +65,7 @@ Joshua Lund
 jpatterson
 Jude Nagurney
 Kenneth Powers
+Luke Pearce
 Luuk Hafkamp (Phusion)
 Luuk Hendriks (Phusion)
 MAEDA Go
@@ -74,6 +76,7 @@ Michal Papis
 Michał Pokrywka
 Mike
 Mike Boone
+Mohammad Aboelnour
 Morton Jonuschat
 Nathaniel Bibler
 Neil Wilson

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.11")
+ *   server_software                                                 string             -          default("Phusion_Passenger/6.0.12")
  *   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/CheckoutSession.cpp

@@ -242,19 +242,25 @@ Controller::reportSessionCheckoutError(Client *client, Request *req,
 	writeOtherExceptionErrorResponse(client, req, e);
 }
 
-void
-Controller::writeRequestQueueFullExceptionErrorResponse(Client *client, Request *req,
-	const boost::shared_ptr<RequestQueueFullException> &e)
+int
+Controller::lookupCodeFromHeader(Request *req, const char* header, int statusCode)
 {
-	TRACE_POINT();
-	const LString *value = req->secureHeaders.lookup(
-		"!~PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE");
-	int requestQueueOverflowStatusCode = 503;
+	const LString *value = req->secureHeaders.lookup(header);
 	if (value != NULL && value->size > 0) {
 		value = psg_lstr_make_contiguous(value, req->pool);
-		requestQueueOverflowStatusCode = stringToInt(
+		statusCode = stringToInt(
 			StaticString(value->start->data, value->size));
 	}
+	return statusCode;
+}
+
+void
+Controller::writeRequestQueueFullExceptionErrorResponse(Client *client, Request *req,
+	const boost::shared_ptr<RequestQueueFullException> &e)
+{
+	TRACE_POINT();
+
+	int requestQueueOverflowStatusCode = lookupCodeFromHeader(req, "!~PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE", 503);
 
 	SKC_WARN(client, "Returning HTTP " << requestQueueOverflowStatusCode <<
 		" due to: " << e->what());
@@ -271,15 +277,20 @@ Controller::writeSpawnExceptionErrorResponse(Client *client, Request *req,
 	const boost::shared_ptr<SpawningKit::SpawnException> &e)
 {
 	TRACE_POINT();
+	int spawnExceptionStatusCode = lookupCodeFromHeader(req, "!~PASSENGER_SPAWN_EXCEPTION_STATUS_CODE", 500);
 	SKC_ERROR(client, "Cannot checkout session because a spawning error occurred. " <<
 		"The identifier of the error is " << e->getId() << ". Please see earlier logs for " <<
 		"details about the error.");
-	endRequestWithErrorResponse(&client, &req, *e);
+	endRequestWithErrorResponse(&client, &req, *e, spawnExceptionStatusCode);
 }
 
 void
 Controller::writeOtherExceptionErrorResponse(Client *client, Request *req, const ExceptionPtr &e) {
 	TRACE_POINT();
+
+	// ATM "other" exceptions always return a spawn exception error message, so use the matching status code
+	int otherExceptionStatusCode = lookupCodeFromHeader(req, "!~PASSENGER_SPAWN_EXCEPTION_STATUS_CODE", 500);
+
 	string typeName;
 	const oxt::tracable_exception &eptr = *e;
 	#ifdef CXX_ABI_API_AVAILABLE
@@ -324,16 +335,16 @@ Controller::writeOtherExceptionErrorResponse(Client *client, Request *req, const
 		}
 		pos = appendData(pos, end, "</p>");
 
-		endRequestWithSimpleResponse(&client, &req, StaticString(buf, pos - buf), 500);
+		endRequestWithSimpleResponse(&client, &req, StaticString(buf, pos - buf), otherExceptionStatusCode);
 	} else {
 		endRequestWithSimpleResponse(&client, &req, "<h2>Internal server error</h2>"
-			"Application could not be started. Please try again later.", 500);
+			"Application could not be started. Please try again later.", otherExceptionStatusCode);
 	}
 }
 
 void
 Controller::endRequestWithErrorResponse(Client **c, Request **r,
-	const SpawningKit::SpawnException &e)
+	const SpawningKit::SpawnException &e, int statusCode)
 {
 	TRACE_POINT();
 	Client *client = *c;
@@ -359,7 +370,7 @@ Controller::endRequestWithErrorResponse(Client **c, Request **r,
 		}
 	}
 
-	endRequestWithSimpleResponse(c, r, psg_pstrdup(req->pool, data), 500);
+	endRequestWithSimpleResponse(c, r, psg_pstrdup(req->pool, data), statusCode);
 }
 
 bool

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.11")
+ *   server_software                                     string             -          default("Phusion_Passenger/6.0.12")
  *   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/Controller/InternalUtils.cpp

@@ -96,7 +96,7 @@ Controller::endRequestWithAppSocketIncompleteResponse(Client **client, Request *
 			SKC_WARN(*client, "Sending 502 response: application did not send a complete response");
 		}
 		endRequestWithSimpleResponse(client, req,
-			"<h2>Incomplete response received from application</h2>", 502);
+			getFormattedMessage(*req, "Incomplete response received from application"), 502);
 	} else {
 		disconnectWithAppSocketIncompleteResponseError(client);
 	}
@@ -107,12 +107,39 @@ Controller::endRequestWithAppSocketReadError(Client **client, Request **req, int
 	Client *c = *client;
 	if (!(*req)->responseBegun) {
 		SKC_WARN(*client, "Sending 502 response: application socket read error");
-		endRequestWithSimpleResponse(client, req, "<h2>Application socket read error</h2>", 502);
+		endRequestWithSimpleResponse(client, req,
+			getFormattedMessage(*req, "Application socket read error"), 502);
 	} else {
 		disconnectWithAppSocketReadError(&c, e);
 	}
 }
 
+ServerKit::HeaderTable
+Controller::getHeadersWithContentType(Request *req)
+{
+	ServerKit::HeaderTable headers;
+	const LString *value = req->headers.lookup(P_STATIC_STRING("content-type"));
+	if (value != NULL) {
+		if (psg_lstr_cmp(value, P_STATIC_STRING("application/json"))) {
+			headers.insert(req->pool, "content-type", "application/json");
+		}
+		// Here we can extend setting `content-type` with more supported formats, ie: xml,...
+	}
+	return headers;
+}
+
+const StaticString
+Controller::getFormattedMessage(Request *req, const StaticString &body)
+{
+	const LString *value = req->headers.lookup(P_STATIC_STRING("content-type"));
+	if (value != NULL) {
+		if (psg_lstr_cmp(value, P_STATIC_STRING("application/json"))) {
+			return "{\"status\":\"error\", \"message\": \""+body+"\"}";
+		}
+	}
+	return "<h1>"+body+"</h1>";
+}
+
 /**
  * `data` must outlive the request.
  */
@@ -122,8 +149,7 @@ Controller::endRequestWithSimpleResponse(Client **c, Request **r,
 {
 	Client *client = *c;
 	Request *req = *r;
-	ServerKit::HeaderTable headers;
-
+	ServerKit::HeaderTable headers = getHeadersWithContentType(req);
 	headers.insert(req->pool, "cache-control", "no-cache, no-store, must-revalidate");
 	writeSimpleResponse(client, code, &headers, body);
 	endRequest(c, r);
@@ -134,9 +160,9 @@ Controller::endRequestAsBadGateway(Client **client, Request **req) {
 	if ((*req)->responseBegun) {
 		disconnectWithError(client, "bad gateway");
 	} else {
-		ServerKit::HeaderTable headers;
+		ServerKit::HeaderTable headers = getHeadersWithContentType(*req);
 		headers.insert((*req)->pool, "cache-control", "no-cache, no-store, must-revalidate");
-		writeSimpleResponse(*client, 502, &headers, "<h1>Bad Gateway</h1>");
+		writeSimpleResponse(*client, 502, &headers, getFormattedMessage(*req, "Bad Gateway"));
 		endRequest(client, req);
 	}
 }

data/src/agent/Core/Controller.h

@@ -207,6 +207,7 @@ private:
 	static void checkoutSessionLater(Request *req);
 	void reportSessionCheckoutError(Client *client, Request *req,
 		const ExceptionPtr &e);
+	int lookupCodeFromHeader(Request *req, const char* header, int statusCode);
 	void writeRequestQueueFullExceptionErrorResponse(Client *client,
 		Request *req, const boost::shared_ptr<RequestQueueFullException> &e);
 	void writeSpawnExceptionErrorResponse(Client *client, Request *req,
@@ -214,7 +215,7 @@ private:
 	void writeOtherExceptionErrorResponse(Client *client, Request *req,
 		const ExceptionPtr &e);
 	void endRequestWithErrorResponse(Client **c, Request **r,
-		const SpawningKit::SpawnException &e);
+		const SpawningKit::SpawnException &e, int statusCode);
 	bool friendlyErrorPagesEnabled(Request *req);
 
 
@@ -313,6 +314,8 @@ private:
 		Request **req);
 	void endRequestWithAppSocketReadError(Client **client, Request **req,
 		int e);
+	ServerKit::HeaderTable getHeadersWithContentType(Request *req);
+	const StaticString getFormattedMessage(Request *req, const StaticString &body);
 	void endRequestWithSimpleResponse(Client **c, Request **r,
 		const StaticString &body, int code = 200);
 	void endRequestAsBadGateway(Client **client, Request **req);

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.11")
+ *   server_software                                                          string             -          default("Phusion_Passenger/6.0.12")
  *   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.11"
+#define PASSENGER_VERSION "6.0.12"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"

data/src/cxx_supportlib/IOTools/IOUtils.cpp

@@ -1183,7 +1183,7 @@ readFileDescriptor(int fd, unsigned long long *timeout) {
 	struct msghdr msg;
 	struct iovec vec;
 	char dummy[1];
-	#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
+	#if defined(__APPLE__) || defined(__SOLARIS__)
 		// File descriptor passing macros (CMSG_*) seem to be broken
 		// on 64-bit MacOS X. This structure works around the problem.
 		struct {
@@ -1226,7 +1226,7 @@ readFileDescriptor(int fd, unsigned long long *timeout) {
 		throw IOException("No valid file descriptor received.");
 	}
 
-	#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
+	#if defined(__APPLE__) || defined(__SOLARIS__)
 		return control_data.fd;
 	#else
 		return *((int *) CMSG_DATA(control_header));
@@ -1242,7 +1242,7 @@ writeFileDescriptor(int fd, int fdToSend, unsigned long long *timeout) {
 	struct msghdr msg;
 	struct iovec vec;
 	char dummy[1];
-	#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
+	#if defined(__APPLE__) || defined(__SOLARIS__)
 		struct {
 			struct cmsghdr header;
 			int fd;
@@ -1273,7 +1273,7 @@ writeFileDescriptor(int fd, int fdToSend, unsigned long long *timeout) {
 	control_header = CMSG_FIRSTHDR(&msg);
 	control_header->cmsg_level = SOL_SOCKET;
 	control_header->cmsg_type  = SCM_RIGHTS;
-	#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
+	#if defined(__APPLE__) || defined(__SOLARIS__)
 		control_header->cmsg_len = sizeof(control_data);
 		control_data.fd = fdToSend;
 	#else

data/src/cxx_supportlib/vendor-modified/boost/align/aligned_alloc.hpp

@@ -0,0 +1,47 @@
+/*
+Copyright 2014-2015 Glen Joseph Fernandes
+(glenjofe@gmail.com)
+
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
+*/
+#ifndef BOOST_ALIGN_ALIGNED_ALLOC_HPP
+#define BOOST_ALIGN_ALIGNED_ALLOC_HPP
+
+#include <boost/config.hpp>
+
+#if defined(BOOST_HAS_UNISTD_H)
+#include <unistd.h>
+#endif
+
+#if defined(__APPLE__) || defined(__APPLE_CC__) || defined(macintosh)
+#include <AvailabilityMacros.h>
+#endif
+
+#if defined(BOOST_ALIGN_USE_ALIGN)
+#include <boost/align/detail/aligned_alloc.hpp>
+#elif defined(BOOST_ALIGN_USE_NEW)
+#include <boost/align/detail/aligned_alloc_new.hpp>
+#elif defined(_MSC_VER) && !defined(UNDER_CE)
+#include <boost/align/detail/aligned_alloc_msvc.hpp>
+#elif defined(__MINGW32__) && (__MSVCRT_VERSION__ >= 0x0700)
+#include <boost/align/detail/aligned_alloc_msvc.hpp>
+#elif defined(__MINGW32__)
+#include <boost/align/detail/aligned_alloc_mingw.hpp>
+#elif MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#include <boost/align/detail/aligned_alloc_posix.hpp>
+#elif MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+#include <boost/align/detail/aligned_alloc_macos.hpp>
+#elif defined(__ANDROID__)
+#include <boost/align/detail/aligned_alloc_android.hpp>
+#elif defined(__SunOS_5_11) || defined(__SunOS_5_12)
+#include <boost/align/detail/aligned_alloc_posix.hpp>
+#elif defined(sun) || defined(__sun)
+#include <boost/align/detail/aligned_alloc_sunos.hpp>
+#elif (_POSIX_C_SOURCE >= 200112L) || (_XOPEN_SOURCE >= 600)
+#include <boost/align/detail/aligned_alloc_posix.hpp>
+#else
+#include <boost/align/detail/aligned_alloc.hpp>
+#endif
+
+#endif

data/src/cxx_supportlib/vendor-modified/boost/align/detail/aligned_alloc_posix.hpp

@@ -0,0 +1,41 @@
+/*
+Copyright 2014 Glen Joseph Fernandes
+(glenjofe@gmail.com)
+
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
+*/
+#ifndef BOOST_ALIGN_DETAIL_ALIGNED_ALLOC_POSIX_HPP
+#define BOOST_ALIGN_DETAIL_ALIGNED_ALLOC_POSIX_HPP
+
+#include <boost/align/detail/is_alignment.hpp>
+#include <boost/assert.hpp>
+#include <stdlib.h>
+
+namespace boost {
+namespace alignment {
+
+inline void*
+aligned_alloc(std::size_t alignment, std::size_t size) BOOST_NOEXCEPT
+{
+    BOOST_ASSERT(detail::is_alignment(alignment));
+    if (alignment < sizeof(void*)) {
+        alignment = sizeof(void*);
+    }
+    void* p;
+    if (::posix_memalign(&p, alignment, size) != 0) {
+        p = 0;
+    }
+    return p;
+}
+
+inline void
+aligned_free(void* ptr) BOOST_NOEXCEPT
+{
+    ::free(ptr);
+}
+
+} /* alignment */
+} /* boost */
+
+#endif

data/src/cxx_supportlib/vendor-modified/boost/align/detail/is_alignment.hpp

@@ -0,0 +1,28 @@
+/*
+Copyright 2014 Glen Joseph Fernandes
+(glenjofe@gmail.com)
+
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
+*/
+#ifndef BOOST_ALIGN_DETAIL_IS_ALIGNMENT_HPP
+#define BOOST_ALIGN_DETAIL_IS_ALIGNMENT_HPP
+
+#include <boost/config.hpp>
+#include <cstddef>
+
+namespace boost {
+namespace alignment {
+namespace detail {
+
+BOOST_CONSTEXPR inline bool
+is_alignment(std::size_t value) BOOST_NOEXCEPT
+{
+    return (value > 0) && ((value & (value - 1)) == 0);
+}
+
+} /* detail */
+} /* alignment */
+} /* boost */
+
+#endif

data/src/cxx_supportlib/vendor-modified/boost/asio/associated_allocator.hpp

@@ -17,15 +17,33 @@
 
 #include <boost/asio/detail/config.hpp>
 #include <memory>
+#include <boost/asio/associator.hpp>
+#include <boost/asio/detail/functional.hpp>
 #include <boost/asio/detail/type_traits.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
 namespace boost {
 namespace asio {
+
+template <typename T, typename Allocator>
+struct associated_allocator;
+
 namespace detail {
 
-template <typename T, typename E, typename = void>
+template <typename T, typename = void>
+struct has_allocator_type : false_type
+{
+};
+
+template <typename T>
+struct has_allocator_type<T,
+  typename void_type<typename T::executor_type>::type>
+    : true_type
+{
+};
+
+template <typename T, typename E, typename = void, typename = void>
 struct associated_allocator_impl
 {
   typedef E type;
@@ -48,6 +66,17 @@ struct associated_allocator_impl<T, E,
   }
 };
 
+template <typename T, typename E>
+struct associated_allocator_impl<T, E,
+  typename enable_if<
+    !has_allocator_type<T>::value
+  >::type,
+  typename void_type<
+    typename associator<associated_allocator, T, E>::type
+  >::type> : associator<associated_allocator, T, E>
+{
+};
+
 } // namespace detail
 
 /// Traits type used to obtain the allocator associated with an object.
@@ -119,6 +148,29 @@ using associated_allocator_t
 
 #endif // defined(BOOST_ASIO_HAS_ALIAS_TEMPLATES)
 
+#if defined(BOOST_ASIO_HAS_STD_REFERENCE_WRAPPER) \
+  || defined(GENERATING_DOCUMENTATION)
+
+/// Specialisation of associated_allocator for @c std::reference_wrapper.
+template <typename T, typename Allocator>
+struct associated_allocator<reference_wrapper<T>, Allocator>
+{
+  /// Forwards @c type to the associator specialisation for the unwrapped type
+  /// @c T.
+  typedef typename associated_allocator<T, Allocator>::type type;
+
+  /// Forwards the request to get the allocator to the associator specialisation
+  /// for the unwrapped type @c T.
+  static type get(reference_wrapper<T> t,
+      const Allocator& a = Allocator()) BOOST_ASIO_NOEXCEPT
+  {
+    return associated_allocator<T, Allocator>::get(t.get(), a);
+  }
+};
+
+#endif // defined(BOOST_ASIO_HAS_STD_REFERENCE_WRAPPER)
+       //   || defined(GENERATING_DOCUMENTATION)
+
 } // namespace asio
 } // namespace boost