passenger 6.0.4 → 6.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0535dba6247039a28dfae09f32b405ad1adf599
-  data.tar.gz: 8842d4a2b0ce4faeb6f731bc4c94742c00f376a7
+  metadata.gz: d9eb2308824a660b5a5618d35e5a7e21c76a7ba8
+  data.tar.gz: 286d69ed238ab96960e25b1b2d583c8b16f338d6
 SHA512:
-  metadata.gz: 49f85e5c9e4de3c9a0cc068ac630b943da61c6f617a156856ce12221c919cc4735cb279d6957fea91a35f8fe024ab020171fd086ccc1d9fcdd507108b86b94d9
-  data.tar.gz: f38614a083fc0e727da69cd758d568b4fe9d58bcedc47ada2513dff23dd412ff4ce34445364f0f7beb441926c9543109512a76d78fd8268b46c18711438b0fd4
+  metadata.gz: d395311456ea63da84dc1768f8b2560b327de66445dda623ee72a45ec6c42f03e0045004280dac6b7e5647bcd8924e8e6c02e912a960627eab095c10366d4138
+  data.tar.gz: 73db977a9ce34dcd94d653ca1a067bc19c68c22f68b71270ca64322b11cbb09c0a015d07b7ab3e65e33ae38c16ec620e7146675ea3d9666d4e4e9411f2ad72ff

data/CHANGELOG

@@ -1,3 +1,45 @@
+Release 6.0.5
+-------------
+
+ * [Enterprise] Fixed a regression (introduced in 5.0.0) where Flying Passenger could not update the Passenger configuration. Closes GH-1554.
+ * Adds Ubuntu 20.04 "Focal" packages, and removes Ubuntu 19.04 "Disco" packages.
+ * Adds RHEL / CentOS 8 packages.
+ * [Nginx] Converts CentOS 7 packages to provide a dynamic module instead of a full Nginx install.
+ * Fixes the encoding name for xml output from the `passenger-status --show=xml` command. Closes GH-2248.
+ * Adds the 'etc' gem as an explicit dependency. Closes GH-2124.
+ * Adds a user agent to the passenger pre-spawn script. Closes GH-1534.
+ * Fixes a compilation issue on FreeBSD. Closes GH-2240.
+ * Fixes an issue where rack bodies may not be processed correctly.
+ * Improves the database reconnection speed in forked processes. closes GH-2253.
+ * [Nginx] Adds a config option `passenger_temp_path` to set the path used for the disk backed response cache. Re-Closes GH-2075.
+ * [Apache] Protects the path info and script name passed to the app from modifications done by mod_security. Closes GH-2198.
+ * Ensures baseuri is set per request, even if config is loaded from cache. Closes GH-2117.
+ * Make temp dir toucher cleanup code more resilient to permissions issues.
+ * [Nginx] Bumps the preferred Nginx version to 1.18.0 (previously 1.17.3).
+ * [Nginx] The preferred PCRE version is now 8.44 (previously 8.43).
+ * Removed deprecated rubyforge gemspec property. Contributed by @olleolleolle.
+ * Adds an option for specifying the attributes on the sticky session cookie:
+	- Apache:     PassengerStickySessionsCookieAttributes     "SameSite=Lax; Secure;"
+	- Nginx:      passenger_sticky_sessions_cookie_attributes "SameSite=Lax; Secure;"
+	- Standalone: --sticky-sessions-cookie-attributes         "SameSite=Lax; Secure;"
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+    - ccache 3.7.9 (was 3.7.3)
+    - Curl 7.69.1 (was 7.66.0)
+    - Git 2.26.2 (was 2.23.0)
+    - GnuPG 2.2.20 (was 2.2.17)
+    - libgpg_error 1.37 (was 1.36)
+    - OpenSSL 1.0.2u (was 1.0.2t)
+    - PCRE 8.44 (was 8.43)
+    - s3cmd 2.1.0 (was 2.0.2)
+    - RubyGems 3.0.8 (was 3.0.6)
+    - Rubies:
+      - 2.4.6 -> 2.4.10
+      - 2.5.5 -> 2.5.8
+      - 2.6.3 -> 2.6.6
+      + 2.7.1
+
+
 Release 6.0.4
 -------------
 
@@ -7,7 +49,7 @@ Release 6.0.4
 Release 6.0.3
 -------------
 
- * Add and option to specify the spawn dir during startup, which is specifically useful for CageFS users. Contributed by @plmnikulin. Closes GH-2145.
+ * Add an option to specify the spawn dir during startup, which is specifically useful for CageFS users. Contributed by @plmnikulin. Closes GH-2145.
 
     - Apache: `PassengerSpawnDir`
     - Nginx: `passenger_spawn_dir`

data/CONTRIBUTORS

@@ -74,6 +74,7 @@ Nathaniel Bibler
 Neil Wilson
 Ninh Bui (Phusion)
 Oleksiy Shchukin
+Olle Jonsson
 Pat Downey
 Paul B
 Paul Kmiec

data/bin/passenger-install-nginx-module

@@ -268,7 +268,7 @@ private
     new_screen
     puts "<banner>PCRE (required by Nginx) not installed, downloading it...</banner>"
 
-    url = "http://downloads.sourceforge.net/project/pcre/pcre/#{PREFERRED_PCRE_VERSION}/pcre-#{PREFERRED_PCRE_VERSION}.tar.gz"
+    url = "https://ftp.pcre.org/pub/pcre/pcre-#{PREFERRED_PCRE_VERSION}.tar.gz"
     dirname = "pcre-#{PREFERRED_PCRE_VERSION}"
     tarball = "#{@working_dir}/pcre.tar.gz"
 

data/passenger.gemspec

@@ -10,12 +10,12 @@ Gem::Specification.new do |s|
   s.summary = "A fast and robust web server and application server for Ruby, Python and Node.js"
   s.name = PhusionPassenger::PACKAGE_NAME
   s.version = PhusionPassenger::VERSION_STRING
-  s.rubyforge_project = "passenger"
   s.author = "Phusion - http://www.phusion.nl/"
   s.email = "software-signing@phusion.nl"
   s.require_paths = ["src/ruby_supportlib"]
   s.add_dependency 'rake', '>= 0.8.1'
   s.add_dependency 'rack'
+  s.add_dependency 'etc'
   s.files = Dir[*PhusionPassenger::Packaging::GLOB] -
     Dir[*PhusionPassenger::Packaging::EXCLUDE_GLOB]
   s.executables = PhusionPassenger::Packaging::USER_EXECUTABLES +

data/resources/templates/standalone/server.erb

@@ -48,6 +48,7 @@ passenger_enabled on;
 <%= nginx_option(app, :restart_dir) %>
 <%= nginx_option(app, :sticky_sessions) %>
 <%= nginx_option(app, :sticky_sessions_cookie_name) %>
+<%= nginx_option(app, :sticky_sessions_cookie_attributes) %>
 <%= nginx_option(app, :vary_turbocache_by_cookie) %>
 <%= nginx_option(app, :meteor_app_settings) %>
 <%= nginx_option(app, :load_shell_envvars) %>

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

@@ -305,7 +305,7 @@ Group::detachedProcessesCheckerMain(GroupPtr self) {
 	while (true) {
 		assert(detachedProcessesCheckerActive);
 
-		if (getLifeStatus() == SHUT_DOWN || this_thread::interruption_requested()) {
+		if (getLifeStatus() == SHUT_DOWN || boost::this_thread::interruption_requested()) {
 			UPDATE_TRACE_POINT();
 			P_DEBUG("Stopping detached processes checker");
 			detachedProcessesCheckerActive = false;

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

@@ -260,6 +260,7 @@ Group::inspectConfigInAdminPanelFormat(Json::Value &result) const {
 	result["abort_websockets_on_process_shutdown"] = VAL(options.abortWebsocketsOnProcessShutdown);
 	result["force_max_concurrent_requests_per_process"] = VAL(options.forceMaxConcurrentRequestsPerProcess, -1);
 	result["restart_dir"] = NON_EMPTY_SVAL(options.restartDir);
+	result["sticky_sessions_cookie_attributes"] = SVAL(options.stickySessionsCookieAttributes, DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES);
 
 	if (!options.environmentVariables.empty()) {
 		DynamicBuffer envvarsData(options.environmentVariables.size() * 3 / 4);

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

@@ -115,6 +115,8 @@ private:
 		result.push_back(&options.hostName);
 		result.push_back(&options.uri);
 
+		result.push_back(&options.stickySessionsCookieAttributes);
+
 		return result;
 	}
 
@@ -353,6 +355,12 @@ public:
 	 */
 	bool abortWebsocketsOnProcessShutdown;
 
+	/**
+	 * The attributes to use for the sticky session cookie.
+	 * Values should validate against the regex: ([\w]+(=[\w]+)?; )*
+	 */
+	StaticString stickySessionsCookieAttributes;
+
 	/*-----------------*/
 
 
@@ -453,6 +461,7 @@ public:
 		  maxOutOfBandWorkInstances(1),
 		  maxRequestQueueSize(DEFAULT_MAX_REQUEST_QUEUE_SIZE),
 		  abortWebsocketsOnProcessShutdown(true),
+		  stickySessionsCookieAttributes(DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES, sizeof(DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES) - 1),
 
 		  stickySessionId(0),
 		  statThrottleRate(DEFAULT_STAT_THROTTLE_RATE),
@@ -582,6 +591,7 @@ public:
 			appendKeyValue3(vec, "max_processes",       maxProcesses);
 			appendKeyValue2(vec, "max_preloader_idle_time", maxPreloaderIdleTime);
 			appendKeyValue3(vec, "max_out_of_band_work_instances", maxOutOfBandWorkInstances);
+			appendKeyValue (vec, "sticky_sessions_cookie_attributes", stickySessionsCookieAttributes);
 		}
 
 		/*********************************/

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

@@ -55,7 +55,7 @@ Pool::garbageCollect(PoolPtr self) {
 		self->garbageCollectionCond.timed_wait(lock,
 			posix_time::seconds(5));
 	}
-	while (!this_thread::interruption_requested()) {
+	while (!boost::this_thread::interruption_requested()) {
 		try {
 			UPDATE_TRACE_POINT();
 			unsigned long long sleepTime = self->realGarbageCollect();

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

@@ -202,7 +202,7 @@ Pool::toXml(const ToXmlOptions &options, bool lock) const {
 		throw SecurityException("Operation unauthorized");
 	}
 
-	result << "<?xml version=\"1.0\" encoding=\"iso8859-1\" ?>\n";
+	result << "<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?>\n";
 	result << "<info version=\"3\">";
 
 	result << "<passenger_version>" << PASSENGER_VERSION << "</passenger_version>";

data/src/agent/Core/Config.h

@@ -162,7 +162,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.4")
+ *   server_software                                                 string             -          default("Phusion_Passenger/6.0.5")
  *   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.h

@@ -123,6 +123,7 @@ private:
 	HashedStaticString PASSENGER_SHOW_VERSION_IN_HEADER;
 	HashedStaticString PASSENGER_STICKY_SESSIONS;
 	HashedStaticString PASSENGER_STICKY_SESSIONS_COOKIE_NAME;
+	HashedStaticString PASSENGER_STICKY_SESSIONS_COOKIE_ATTRIBUTES;
 	HashedStaticString PASSENGER_REQUEST_OOB_WORK;
 	HashedStaticString REMOTE_ADDR;
 	HashedStaticString REMOTE_PORT;

data/src/agent/Core/Controller/Config.h

@@ -113,7 +113,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.4")
+ *   server_software                                     string             -          default("Phusion_Passenger/6.0.5")
  *   show_version_in_header                              boolean            -          default(true)
  *   start_reading_after_accept                          boolean            -          default(true)
  *   stat_throttle_rate                                  unsigned integer   -          default(10)
@@ -154,6 +154,7 @@ private:
 		add("default_server_port", UINT_TYPE, REQUIRED);
 		add("default_sticky_sessions", BOOL_TYPE, OPTIONAL, false);
 		add("default_sticky_sessions_cookie_name", STRING_TYPE, OPTIONAL, DEFAULT_STICKY_SESSIONS_COOKIE_NAME);
+		add("default_sticky_sessions_cookie_attributes", STRING_TYPE, OPTIONAL, DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES);
 		add("server_software", STRING_TYPE, OPTIONAL, SERVER_TOKEN_NAME "/" PASSENGER_VERSION);
 		add("vary_turbocache_by_cookie", STRING_TYPE, OPTIONAL);
 
@@ -419,6 +420,7 @@ public:
 	StaticString defaultServerPort;
 	StaticString serverSoftware;
 	StaticString defaultStickySessionsCookieName;
+	StaticString defaultStickySessionsCookieAttributes;
 	StaticString defaultVaryTurbocacheByCookie;
 
 	StaticString defaultFriendlyErrorPages;
@@ -451,6 +453,7 @@ public:
 		  defaultServerPort(psg_pstrdup(pool, config["default_server_port"].asString())),
 		  serverSoftware(psg_pstrdup(pool, config["server_software"].asString())),
 		  defaultStickySessionsCookieName(psg_pstrdup(pool, config["default_sticky_sessions_cookie_name"].asString())),
+		  defaultStickySessionsCookieAttributes(psg_pstrdup(pool, config["default_sticky_sessions_cookie_attributes"].asString())),
 		  defaultVaryTurbocacheByCookie(psg_pstrdup(pool, config["vary_turbocache_by_cookie"].asString())),
 
 		  defaultFriendlyErrorPages(psg_pstrdup(pool, config["default_friendly_error_pages"].asString())),

data/src/agent/Core/Controller/ForwardResponse.cpp

@@ -768,6 +768,19 @@ Controller::constructHeaderBuffersForResponse(Request *req, struct iovec *buffer
 		dataSize += baseURI.size();
 		INC_BUFFER_ITER(i);
 
+
+		StaticString stickyAttributes = req->options.stickySessionsCookieAttributes;
+		if (stickyAttributes.size() > 0) {
+			PUSH_STATIC_BUFFER("; ");
+			if (buffers != NULL) {
+				BEGIN_PUSH_NEXT_BUFFER();
+				buffers[i].iov_base = (void *) stickyAttributes.data();
+				buffers[i].iov_len  = stickyAttributes.size();
+			}
+			dataSize += stickyAttributes.size();
+			INC_BUFFER_ITER(i);
+		}
+
 		PUSH_STATIC_BUFFER("\r\n");
 	}
 

data/src/agent/Core/Controller/InitRequest.cpp

@@ -153,6 +153,7 @@ Controller::initializePoolOptions(Client *client, Request *req, RequestAnalysis
 
 			if (options != NULL) {
 				req->options = **options;
+				fillPoolOption(req, req->options.baseURI, "!~SCRIPT_NAME");
 			} else {
 				createNewPoolOptions(client, req, hAppGroupName);
 			}
@@ -202,6 +203,7 @@ Controller::fillPoolOptionsFromConfigCaches(Options &options,
 	options.loadShellEnvvars = requestConfig->defaultLoadShellEnvvars;
 	options.statThrottleRate = mainConfig.statThrottleRate;
 	options.maxRequests = requestConfig->defaultMaxRequests;
+	options.stickySessionsCookieAttributes = requestConfig->defaultStickySessionsCookieAttributes;
 
 	/******************************/
 }
@@ -377,6 +379,7 @@ Controller::createNewPoolOptions(Client *client, Request *req,
 	fillPoolOption(req, options.fileDescriptorUlimit, "!~PASSENGER_APP_FILE_DESCRIPTOR_ULIMIT");
 	fillPoolOption(req, options.raiseInternalError, "!~PASSENGER_RAISE_INTERNAL_ERROR");
 	fillPoolOption(req, options.lveMinUid, "!~PASSENGER_LVE_MIN_UID");
+	fillPoolOption(req, options.stickySessionsCookieAttributes, "!~PASSENGER_STICKY_SESSIONS_COOKIE_ATTRIBUTES");
 
 	// maxProcesses is configured per-application by the (Enterprise) maxInstances option (and thus passed
 	// via request headers). In OSS the max processes can also be configured, but on a global level

data/src/agent/Core/Controller/InitializationAndShutdown.cpp

@@ -70,6 +70,7 @@ Controller::preinitialize() {
 	PASSENGER_SHOW_VERSION_IN_HEADER = "!~PASSENGER_SHOW_VERSION_IN_HEADER";
 	PASSENGER_STICKY_SESSIONS = "!~PASSENGER_STICKY_SESSIONS";
 	PASSENGER_STICKY_SESSIONS_COOKIE_NAME = "!~PASSENGER_STICKY_SESSIONS_COOKIE_NAME";
+	PASSENGER_STICKY_SESSIONS_COOKIE_ATTRIBUTES = "!~PASSENGER_STICKY_SESSIONS_COOKIE_ATTRIBUTES";
 	PASSENGER_REQUEST_OOB_WORK = "!~Request-OOB-Work";
 	REMOTE_ADDR = "!~REMOTE_ADDR";
 	REMOTE_PORT = "!~REMOTE_PORT";

data/src/agent/Core/OptionParser.h

@@ -173,6 +173,9 @@ coreUsage() {
 	printf("      --sticky-sessions-cookie-name NAME\n");
 	printf("                            Cookie name to use for sticky sessions.\n");
 	printf("                            Default: " DEFAULT_STICKY_SESSIONS_COOKIE_NAME "\n");
+	printf("      --sticky-sessions-cookie-attributes 'NAME1=VALUE1; NAME2'\n");
+	printf("                            The attributes to use for the sticky session cookie.\n");
+	printf("                            Default: " DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES "\n");
 	printf("      --vary-turbocache-by-cookie NAME\n");
 	printf("                            Vary the turbocache by the cookie of the given name\n");
 	printf("      --disable-turbocaching\n");

data/src/agent/TempDirToucher/TempDirToucherMain.cpp

@@ -415,9 +415,11 @@ doSleep(int sec) {
 
 static void
 maybeDeletePidFile() {
+	up_privilege();
 	if (pidFile != NULL) {
 		unlink(pidFile);
 	}
+	down_privilege();
 }
 
 static void

data/src/agent/Watchdog/Config.h

@@ -151,7 +151,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.4")
+ *   server_software                                                          string             -          default("Phusion_Passenger/6.0.5")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only

data/src/apache2_module/Hooks.cpp

@@ -1020,6 +1020,10 @@ private:
 			env = (apr_table_entry_t*) env_arr->elts;
 
 			for (i = 0; i < env_arr->nelts; ++i) {
+				if ((strcmp(env[i].key, "SCRIPT_NAME") == 0)
+				 || (strcmp(env[i].key, "PATH_INFO")   == 0)) {
+					continue;
+				}
 				envvarsData.append(env[i].key);
 				envvarsData.append("\0", 1);
 				if (env[i].val != NULL) {

data/src/cxx_supportlib/Constants.h

@@ -68,6 +68,7 @@
 #define DEFAULT_SPAWN_METHOD "smart"
 #define DEFAULT_START_TIMEOUT 90000
 #define DEFAULT_STAT_THROTTLE_RATE 10
+#define DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES "SameSite=Lax; Secure;"
 #define DEFAULT_STICKY_SESSIONS_COOKIE_NAME "_passenger_route"
 #define DEFAULT_WEB_APP_USER "nobody"
 #define ENTERPRISE_URL "https://www.phusionpassenger.com/enterprise"
@@ -81,7 +82,7 @@
 #define PASSENGER_API_VERSION_MAJOR 0
 #define PASSENGER_API_VERSION_MINOR 3
 #define PASSENGER_DEFAULT_USER "nobody"
-#define PASSENGER_VERSION "6.0.4"
+#define PASSENGER_VERSION "6.0.5"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"

data/src/cxx_supportlib/oxt/system_calls.cpp

@@ -132,15 +132,15 @@ shouldSimulateFailure() {
 			_my_errno = errno; \
 		} while ((error_expression) \
 			&& _my_errno == EINTR \
-			&& (!this_thread::syscalls_interruptable() \
-			    || !(_intr_requested = this_thread::interruption_requested())) \
+			&& (!boost::this_thread::syscalls_interruptable() \
+			    || !(_intr_requested = boost::this_thread::interruption_requested())) \
 		); \
 		if (OXT_LIKELY(ctx != NULL)) { \
 			ctx->syscall_interruption_lock.lock(); \
 		} \
 		if ((error_expression) \
 		 && _my_errno == EINTR \
-		 && this_thread::syscalls_interruptable() \
+		 && boost::this_thread::syscalls_interruptable() \
 		 && _intr_requested) { \
 			throw thread_interrupted(); \
 		} \
@@ -284,8 +284,8 @@ syscalls::close(int fd) {
 		}
 		if (ret == -1
 		 && errno == EINTR
-		 && this_thread::syscalls_interruptable()
-		 && this_thread::interruption_requested()) {
+		 && boost::this_thread::syscalls_interruptable()
+		 && boost::this_thread::interruption_requested()) {
 			throw thread_interrupted();
 		} else {
 			return ret;
@@ -662,8 +662,8 @@ syscalls::nanosleep(const struct timespec *req, struct timespec *rem) {
 		}
 	} while (ret == -1
 		&& e == EINTR
-		&& (!this_thread::syscalls_interruptable()
-		    || !(intr_requested = this_thread::interruption_requested()))
+		&& (!boost::this_thread::syscalls_interruptable()
+		    || !(intr_requested = boost::this_thread::interruption_requested()))
 	);
 
 	if (OXT_UNLIKELY(ctx != NULL)) {
@@ -672,7 +672,7 @@ syscalls::nanosleep(const struct timespec *req, struct timespec *rem) {
 
 	if (ret == -1
 	 && e == EINTR
-	 && this_thread::syscalls_interruptable()
+	 && boost::this_thread::syscalls_interruptable()
 	 && intr_requested) {
 		throw thread_interrupted();
 	}
@@ -748,14 +748,14 @@ syscalls::waitpid(pid_t pid, int *status, int options) {
 	 * http://stackoverflow.com/questions/20410943/segmentation-fault-when-accessing-statically-initialized-thread-variable?noredirect=1#comment30483943_20410943
 	 * https://bugzilla.redhat.com/show_bug.cgi?id=731228
 	 */
-	__thread int this_thread::_syscalls_interruptable = 1;
+	__thread int boost::this_thread::_syscalls_interruptable = 1;
 
 	bool
 	boost::this_thread::syscalls_interruptable() {
 		return _syscalls_interruptable;
 	}
 #else
-	boost::thread_specific_ptr<bool> this_thread::_syscalls_interruptable;
+	boost::thread_specific_ptr<bool> boost::this_thread::_syscalls_interruptable;
 
 	bool
 	boost::this_thread::syscalls_interruptable() {

data/src/helper-scripts/prespawn

@@ -107,6 +107,7 @@ class PrespawnLocation
   def head_request
     socket.write("HEAD #{request_path} HTTP/1.1\r\n")
     socket.write("Host: #{request_host}\r\n")
+    socket.write("User-Agent: Passenger Prespawn Script\r\n")
     socket.write("Authorization: Basic " + base64(@uri.userinfo) + "\r\n") if @uri.userinfo
     socket.write("Connection: close\r\n")
     socket.write("\r\n")

data/src/nginx_module/ConfigGeneral/AutoGeneratedDefinitions.c

@@ -542,6 +542,14 @@
     offsetof(passenger_loc_conf_t, autogenerated.document_root),
     NULL
 },
+{
+    ngx_string("passenger_temp_path"),
+    NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+    ngx_conf_set_path_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(passenger_loc_conf_t, upstream_config.temp_path),
+    NULL
+},
 {
     ngx_string("passenger_ignore_headers"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_1MORE,
@@ -678,6 +686,14 @@
     offsetof(passenger_loc_conf_t, autogenerated.sticky_sessions_cookie_name),
     NULL
 },
+{
+    ngx_string("passenger_sticky_sessions_cookie_attributes"),
+    NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_sticky_sessions_cookie_attributes,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(passenger_loc_conf_t, autogenerated.sticky_sessions_cookie_attributes),
+    NULL
+},
 {
     ngx_string("passenger_vary_turbocache_by_cookie"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,

data/src/nginx_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.c

@@ -430,5 +430,12 @@ set_manifest_autogenerated_loc_conf_defaults(manifest_gen_ctx_t *ctx, PsgJsonVal
         "_passenger_route",
         sizeof("_passenger_route") - 1);
 
+    add_manifest_options_container_static_default_str(ctx,
+        options_container,
+        "passenger_sticky_sessions_cookie_attributes",
+        sizeof("passenger_sticky_sessions_cookie_attributes") - 1,
+        "SameSite=Lax; Secure;",
+        sizeof("SameSite=Lax; Secure;") - 1);
+
 }
 

data/src/nginx_module/ConfigGeneral/AutoGeneratedSetterFuncs.c

@@ -961,6 +961,18 @@ passenger_conf_set_sticky_sessions_cookie_name(ngx_conf_t *cf, ngx_command_t *cm
     return ngx_conf_set_str_slot(cf, cmd, conf);
 }
 
+static char *
+passenger_conf_set_sticky_sessions_cookie_attributes(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    passenger_loc_conf_t *passenger_conf = conf;
+
+    passenger_conf->autogenerated.sticky_sessions_cookie_attributes_explicitly_set = 1;
+    record_loc_conf_source_location(cf, passenger_conf,
+        &passenger_conf->autogenerated.sticky_sessions_cookie_attributes_source_file,
+        &passenger_conf->autogenerated.sticky_sessions_cookie_attributes_source_line);
+
+    return ngx_conf_set_str_slot(cf, cmd, conf);
+}
+
 static char *
 passenger_conf_set_vary_turbocache_by_cookie(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;

data/src/nginx_module/Configuration.c

@@ -577,10 +577,14 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
                                        |NGX_HTTP_UPSTREAM_FT_OFF;
     }
 
-    ngx_conf_merge_path_value(cf,
+    if (ngx_conf_merge_path_value(cf,
                               &conf->upstream_config.temp_path,
                               prev->upstream_config.temp_path,
-                              &ngx_http_proxy_temp_path);
+                              &ngx_http_proxy_temp_path)
+        != NGX_OK)
+    {
+        return NGX_CONF_ERROR;
+    }
 
 #if (NGX_HTTP_CACHE)
 

data/src/nginx_module/ContentHandler.c

@@ -1824,8 +1824,6 @@ passenger_content_handler(ngx_http_request_t *r)
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
-    //u->pipe->temp_file->path = u->conf->temp_path;
-
     u->pipe->input_filter = ngx_event_pipe_copy_input_filter;
     u->pipe->input_ctx = r;
 

data/src/nginx_module/LocationConfig/AutoGeneratedCreateFunction.c

@@ -93,6 +93,8 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->sticky_sessions = NGX_CONF_UNSET;
     conf->sticky_sessions_cookie_name.data = NULL;
     conf->sticky_sessions_cookie_name.len  = 0;
+    conf->sticky_sessions_cookie_attributes.data = NULL;
+    conf->sticky_sessions_cookie_attributes.len  = 0;
     conf->vary_turbocache_by_cookie.data = NULL;
     conf->vary_turbocache_by_cookie.len  = 0;
     conf->app_log_file.data = NULL;
@@ -218,6 +220,10 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->document_root_source_file.len = 0;
     conf->document_root_source_line = 0;
     conf->document_root_explicitly_set = 0;
+    conf->upstream_config_temp_path_source_file.data = NULL;
+    conf->upstream_config_temp_path_source_file.len = 0;
+    conf->upstream_config_temp_path_source_line = 0;
+    conf->upstream_config_temp_path_explicitly_set = 0;
     conf->upstream_config_ignore_headers_source_file.data = NULL;
     conf->upstream_config_ignore_headers_source_file.len = 0;
     conf->upstream_config_ignore_headers_source_line = 0;
@@ -286,6 +292,10 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->sticky_sessions_cookie_name_source_file.len = 0;
     conf->sticky_sessions_cookie_name_source_line = 0;
     conf->sticky_sessions_cookie_name_explicitly_set = 0;
+    conf->sticky_sessions_cookie_attributes_source_file.data = NULL;
+    conf->sticky_sessions_cookie_attributes_source_file.len = 0;
+    conf->sticky_sessions_cookie_attributes_source_line = 0;
+    conf->sticky_sessions_cookie_attributes_explicitly_set = 0;
     conf->vary_turbocache_by_cookie_source_file.data = NULL;
     conf->vary_turbocache_by_cookie_source_file.len = 0;
     conf->vary_turbocache_by_cookie_source_line = 0;

data/src/nginx_module/LocationConfig/AutoGeneratedHeaderSerialization.c

@@ -238,6 +238,12 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
         len += sizeof("\r\n") - 1;
     }
 
+    if (conf->autogenerated.sticky_sessions_cookie_attributes.data != NULL) {
+        len += sizeof("!~PASSENGER_STICKY_SESSIONS_COOKIE_ATTRIBUTES: ") - 1;
+        len += conf->autogenerated.sticky_sessions_cookie_attributes.len;
+        len += sizeof("\r\n") - 1;
+    }
+
     if (conf->autogenerated.vary_turbocache_by_cookie.data != NULL) {
         len += sizeof("!~PASSENGER_VARY_TURBOCACHE_BY_COOKIE: ") - 1;
         len += conf->autogenerated.vary_turbocache_by_cookie.len;
@@ -515,6 +521,15 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
             conf->autogenerated.sticky_sessions_cookie_name.len);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
+    if (conf->autogenerated.sticky_sessions_cookie_attributes.data != NULL) {
+        pos = ngx_copy(pos,
+            "!~PASSENGER_STICKY_SESSIONS_COOKIE_ATTRIBUTES: ",
+            sizeof("!~PASSENGER_STICKY_SESSIONS_COOKIE_ATTRIBUTES: ") - 1);
+        pos = ngx_copy(pos,
+            conf->autogenerated.sticky_sessions_cookie_attributes.data,
+            conf->autogenerated.sticky_sessions_cookie_attributes.len);
+        pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
+    }
     if (conf->autogenerated.vary_turbocache_by_cookie.data != NULL) {
         pos = ngx_copy(pos,
             "!~PASSENGER_VARY_TURBOCACHE_BY_COOKIE: ",

data/src/nginx_module/LocationConfig/AutoGeneratedManifestGeneration.c

@@ -622,6 +622,20 @@ generate_config_manifest_for_autogenerated_loc_conf(manifest_gen_ctx_t *ctx, pas
             (const char *) plcf->autogenerated.sticky_sessions_cookie_name.data,
             plcf->autogenerated.sticky_sessions_cookie_name.len);
     }
+    if (plcf->autogenerated.sticky_sessions_cookie_attributes_explicitly_set) {
+        find_or_create_manifest_app_and_loc_options_containers(ctx,
+            plcf, cscf, clcf, &app_options_container, &loc_options_container);
+        option_container = find_or_create_manifest_option_container(ctx,
+            loc_options_container,
+            "passenger_sticky_sessions_cookie_attributes",
+            sizeof("passenger_sticky_sessions_cookie_attributes") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.sticky_sessions_cookie_attributes_source_file,
+            plcf->autogenerated.sticky_sessions_cookie_attributes_source_line);
+        psg_json_value_set_str(hierarchy_member, "value",
+            (const char *) plcf->autogenerated.sticky_sessions_cookie_attributes.data,
+            plcf->autogenerated.sticky_sessions_cookie_attributes.len);
+    }
     if (plcf->autogenerated.vary_turbocache_by_cookie_explicitly_set) {
         find_or_create_manifest_app_and_loc_options_containers(ctx,
             plcf, cscf, clcf, &app_options_container, &loc_options_container);
@@ -653,6 +667,7 @@ generate_config_manifest_for_autogenerated_loc_conf(manifest_gen_ctx_t *ctx, pas
 
     /*
      * No autogenerated code for:
+     * passenger_temp_path
      * passenger_ignore_headers
      * passenger_buffer_size
      * passenger_buffers

data/src/nginx_module/LocationConfig/AutoGeneratedMergeFunction.c

@@ -157,6 +157,9 @@ passenger_merge_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t *conf,
     ngx_conf_merge_str_value(conf->sticky_sessions_cookie_name,
         prev->sticky_sessions_cookie_name,
         "_passenger_route");
+    ngx_conf_merge_str_value(conf->sticky_sessions_cookie_attributes,
+        prev->sticky_sessions_cookie_attributes,
+        "SameSite=Lax; Secure;");
     ngx_conf_merge_str_value(conf->vary_turbocache_by_cookie,
         prev->vary_turbocache_by_cookie,
         NULL);

data/src/nginx_module/LocationConfig/AutoGeneratedStruct.h

@@ -75,6 +75,7 @@ typedef struct {
     ngx_str_t ruby;
     ngx_str_t spawn_method;
     ngx_str_t startup_file;
+    ngx_str_t sticky_sessions_cookie_attributes;
     ngx_str_t sticky_sessions_cookie_name;
     ngx_str_t user;
     ngx_str_t vary_turbocache_by_cookie;
@@ -115,6 +116,7 @@ typedef struct {
     ngx_str_t start_timeout_source_file;
     ngx_str_t startup_file_source_file;
     ngx_str_t sticky_sessions_source_file;
+    ngx_str_t sticky_sessions_cookie_attributes_source_file;
     ngx_str_t sticky_sessions_cookie_name_source_file;
     ngx_str_t upstream_config_buffer_size_source_file;
     ngx_str_t upstream_config_buffering_source_file;
@@ -126,6 +128,7 @@ typedef struct {
     ngx_str_t upstream_config_pass_headers_source_file;
     ngx_str_t upstream_config_read_timeout_source_file;
     ngx_str_t upstream_config_request_buffering_source_file;
+    ngx_str_t upstream_config_temp_path_source_file;
     ngx_str_t user_source_file;
     ngx_str_t vary_turbocache_by_cookie_source_file;
 
@@ -165,6 +168,7 @@ typedef struct {
     ngx_uint_t start_timeout_source_line;
     ngx_uint_t startup_file_source_line;
     ngx_uint_t sticky_sessions_source_line;
+    ngx_uint_t sticky_sessions_cookie_attributes_source_line;
     ngx_uint_t sticky_sessions_cookie_name_source_line;
     ngx_uint_t upstream_config_buffer_size_source_line;
     ngx_uint_t upstream_config_buffering_source_line;
@@ -176,6 +180,7 @@ typedef struct {
     ngx_uint_t upstream_config_pass_headers_source_line;
     ngx_uint_t upstream_config_read_timeout_source_line;
     ngx_uint_t upstream_config_request_buffering_source_line;
+    ngx_uint_t upstream_config_temp_path_source_line;
     ngx_uint_t user_source_line;
     ngx_uint_t vary_turbocache_by_cookie_source_line;
 
@@ -215,6 +220,7 @@ typedef struct {
     ngx_int_t start_timeout_explicitly_set;
     ngx_int_t startup_file_explicitly_set;
     ngx_int_t sticky_sessions_explicitly_set;
+    ngx_int_t sticky_sessions_cookie_attributes_explicitly_set;
     ngx_int_t sticky_sessions_cookie_name_explicitly_set;
     ngx_int_t upstream_config_buffer_size_explicitly_set;
     ngx_int_t upstream_config_buffering_explicitly_set;
@@ -226,6 +232,7 @@ typedef struct {
     ngx_int_t upstream_config_pass_headers_explicitly_set;
     ngx_int_t upstream_config_read_timeout_explicitly_set;
     ngx_int_t upstream_config_request_buffering_explicitly_set;
+    ngx_int_t upstream_config_temp_path_explicitly_set;
     ngx_int_t user_explicitly_set;
     ngx_int_t vary_turbocache_by_cookie_explicitly_set;
 } passenger_autogenerated_loc_conf_t;

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,20 +31,20 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h configkit_schemas_inline_comments' after changing this number.
-  VERSION_STRING = '6.0.4'
+  VERSION_STRING = '6.0.5'
 
   # Tip: find the SHA-256 with ./dev/nginx_version_sha2 <VERSION>
-  PREFERRED_NGINX_VERSION = '1.17.3'
-  NGINX_SHA256_CHECKSUM = '3b84fe1c2cf9ca22fde370e486a9ab16b6427df1b6ea62cdb61978c9f34d0f3c'
+  PREFERRED_NGINX_VERSION = '1.18.0'
+  NGINX_SHA256_CHECKSUM = '4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99'
 
   # Packaging may be locked to an older version due to the specific module configuration being
   # incompatible with the version we prefer (latest stable).
-  PACKAGING_PREFERRED_NGINX_VERSION = '1.17.3'
-  PACKAGING_NGINX_SHA256_CHECKSUM = '3b84fe1c2cf9ca22fde370e486a9ab16b6427df1b6ea62cdb61978c9f34d0f3c'
+  PACKAGING_PREFERRED_NGINX_VERSION = '1.18.0'
+  PACKAGING_NGINX_SHA256_CHECKSUM = '4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99'
 
   # sha256sum of the .tar.gz
-  PREFERRED_PCRE_VERSION  = '8.43'
-  PCRE_SHA256_CHECKSUM = '0b8e7465dc5e98c757cc3650a20a7843ee4c3edf50aaf60bb33fd879690d2c73'
+  PREFERRED_PCRE_VERSION  = '8.44'
+  PCRE_SHA256_CHECKSUM = 'aecafd4af3bd0f3935721af77b889d9024b2e01d96b58471bd91a3063fb47728'
 
   STANDALONE_INTERFACE_VERSION  = 1
 

data/src/ruby_supportlib/phusion_passenger/apache2/config_options.rb

@@ -547,6 +547,15 @@ APACHE2_CONFIGURATION_OPTIONS = [
     :default_expr => 'DEFAULT_STICKY_SESSIONS_COOKIE_NAME',
     :desc      => 'The cookie name to use for sticky sessions.'
   },
+  {
+    :name      => 'PassengerStickySessionsCookieAttributes',
+    :type      => :string,
+    :context   => :location,
+    :htaccess_context => ['OR_ALL'],
+    :default   => DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES,
+    :default_expr => 'DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES',
+    :desc      => 'The attributes to use for the sticky session cookie.'
+  },
   {
     :name      => 'PassengerBufferResponse',
     :type      => :flag,

data/src/ruby_supportlib/phusion_passenger/constants.rb

@@ -62,6 +62,7 @@ module PhusionPassenger
     PASSENGER_DEFAULT_USER = "nobody"
     DEFAULT_CONCURRENCY_MODEL = "process"
     DEFAULT_STICKY_SESSIONS_COOKIE_NAME = "_passenger_route"
+    DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES = "SameSite=Lax; Secure;"
     DEFAULT_APP_THREAD_COUNT = 1
     DEFAULT_RESPONSE_BUFFER_HIGH_WATERMARK = 1024 * 1024 * 128
     DEFAULT_MAX_REQUEST_QUEUE_SIZE = 100

data/src/ruby_supportlib/phusion_passenger/loader_shared_helpers.rb

@@ -316,10 +316,8 @@ module PhusionPassenger
           ActiveRecord::Base.clear_all_connections!
         elsif ActiveRecord::Base.respond_to?(:clear_active_connections!)
           ActiveRecord::Base.clear_active_connections!
-        elsif ActiveRecord::Base.respond_to?(:connected?) &&
-              ActiveRecord::Base.connected?
-          ActiveRecord::Base.establish_connection
         end
+        ActiveRecord::Base.establish_connection
       end
 
       # Fire off events.

data/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb

@@ -556,6 +556,14 @@ NGINX_CONFIGURATION_OPTIONS = [
     :type     => :string,
     :header   => nil
   },
+  {
+    :name     => 'passenger_temp_path',
+    :scope    => :location,
+    :type     => :string,
+    :function => 'ngx_conf_set_path_slot',
+    :field    => 'upstream_config.temp_path',
+    :auto_generate_nginx_tracking_code => false
+  },
   {
     :name     => 'passenger_ignore_headers',
     :scope    => :location,
@@ -681,6 +689,12 @@ NGINX_CONFIGURATION_OPTIONS = [
     :type     => :string,
     :default  => DEFAULT_STICKY_SESSIONS_COOKIE_NAME
   },
+  {
+    :name     => 'passenger_sticky_sessions_cookie_attributes',
+    :scope    => :location,
+    :type     => :string,
+    :default  => DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES
+  },
   {
     :name     => 'passenger_vary_turbocache_by_cookie',
     :scope    => :location,

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

@@ -279,7 +279,7 @@ module PhusionPassenger
           "-c '#{filename}' -o '#{filename}.o'",
           flags)
         result = run_compiler(description, command, filename, source, true)
-        result = result && result[:result] && result[:output] !~ /unknown warning option/i
+        result = result && result[:result] && result[:output] !~ /unknown warning option|unrecognized command line option/i
       end
       return false if !result
 

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

@@ -25,6 +25,16 @@
 
 PhusionPassenger.require_passenger_lib 'utils/tee_input'
 
+if defined?(::Rack::BodyProxy) && !::Rack::BodyProxy.new("").respond_to?(:each)
+  module ::Rack
+    class BodyProxy
+      def each
+        @body.each { |body| yield body }
+      end
+    end
+  end
+end
+
 module PhusionPassenger
   module Rack
 

data/src/ruby_supportlib/phusion_passenger/standalone/config_options_list.rb

@@ -436,6 +436,12 @@ module PhusionPassenger
         :desc      => "Cookie name to use for sticky sessions.\n" \
                       "Default: #{DEFAULT_STICKY_SESSIONS_COOKIE_NAME}"
       },
+      {
+        :name      => :sticky_sessions_cookie_attributes,
+        :type_desc => "'NAME1=VALUE1; NAME2'",
+        :desc      => "The attributes to use for the sticky session cookie.\n" \
+                      "Default: #{DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES}"
+      },
       {
         :name      => :vary_turbocache_by_cookie,
         :type_desc => 'NAME',

data/src/ruby_supportlib/phusion_passenger/standalone/start_command/builtin_engine.rb

@@ -175,6 +175,7 @@ module PhusionPassenger
           add_flag_param(command, :sticky_sessions, "--sticky-sessions")
           add_param(command, :vary_turbocache_by_cookie, "--vary-turbocache-by-cookie")
           add_param(command, :sticky_sessions_cookie_name, "--sticky-sessions-cookie-name")
+          add_param(command, :sticky_sessions_cookie_attributes, "--sticky-sessions-cookie-attributes")
           add_param(command, :ruby, "--ruby")
           add_param(command, :python, "--python")
           add_param(command, :nodejs, "--nodejs")

data/src/ruby_supportlib/phusion_passenger/standalone/start_command/nginx_engine.rb

@@ -286,7 +286,7 @@ module PhusionPassenger
           if fix_existing_indenting
             # Remove extraneous indenting by 'if' blocks
             # and collapse multiple empty newlines
-            result.gsub!(/;[\n ]+/, ";\n")
+            result.gsub!(/;[\n ]+$/, ";\n")
           end
 
           # Set indenting

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

@@ -24,6 +24,10 @@
 
 PhusionPassenger.require_passenger_lib 'utils'   # So that we can know whether #writev is supported.
 
+# https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/
+def ruby2_keywords(*)
+end if RUBY_VERSION < "2.7"
+
 module PhusionPassenger
   module Utils
 
@@ -117,7 +121,7 @@ module PhusionPassenger
         raise annotate(e)
       end
 
-      def write_nonblock(string, *args)
+      ruby2_keywords def write_nonblock(string, *args)
         @socket.write_nonblock(string, *args)
       rescue => e
         raise annotate(e)
@@ -141,25 +145,25 @@ module PhusionPassenger
         raise annotate(e)
       end if IO.method_defined?(:writev3)
 
-      def send(*args)
+      ruby2_keywords def send(*args)
         @socket.send(*args)
       rescue => e
         raise annotate(e)
       end
 
-      def sendmsg(*args)
+      ruby2_keywords def sendmsg(*args)
         @socket.sendmsg(*args)
       rescue => e
         raise annotate(e)
       end
 
-      def sendmsg_nonblock(*args)
+      ruby2_keywords def sendmsg_nonblock(*args)
         @socket.sendmsg_nonblock(*args)
       rescue => e
         raise annotate(e)
       end
 
-      def puts(*args)
+      ruby2_keywords def puts(*args)
         @socket.puts(*args)
       rescue => e
         raise annotate(e)
@@ -172,7 +176,7 @@ module PhusionPassenger
         raise annotate(e)
       end
 
-      def read(*args)
+      ruby2_keywords def read(*args)
         if @simulate_eof
           length, buffer = args
           if buffer
@@ -191,14 +195,14 @@ module PhusionPassenger
         raise annotate(e)
       end
 
-      def read_nonblock(*args)
+      ruby2_keywords def read_nonblock(*args)
         raise EOFError, "end of file reached" if @simulate_eof
         @socket.read_nonblock(*args)
       rescue => e
         raise annotate(e)
       end
 
-      def readpartial(*args)
+      ruby2_keywords def readpartial(*args)
         raise EOFError, "end of file reached" if @simulate_eof
         @socket.readpartial(*args)
       rescue => e
@@ -212,21 +216,21 @@ module PhusionPassenger
         raise annotate(e)
       end
 
-      def recv(*args)
+      ruby2_keywords def recv(*args)
         raise EOFError, "end of file reached" if @simulate_eof
         @socket.recv(*args)
       rescue => e
         raise annotate(e)
       end
 
-      def recvfrom(*args)
+      ruby2_keywords def recvfrom(*args)
         raise EOFError, "end of file reached" if @simulate_eof
         @socket.recvfrom(*args)
       rescue => e
         raise annotate(e)
       end
 
-      def recvfrom_nonblock(*args)
+      ruby2_keywords def recvfrom_nonblock(*args)
         raise EOFError, "end of file reached" if @simulate_eof
         @socket.recvfrom_nonblock(*args)
       rescue => e

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 6.0.4
+  version: 6.0.5
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2020-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: etc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A modern web server and application server for Ruby, Python and Node.js,
   optimized for performance, low memory usage and ease of use.
 email: software-signing@phusion.nl
@@ -4459,7 +4473,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: passenger
+rubyforge_project: 
 rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4