passenger 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34715c64cf360a223e40a17d54ba2939789d82dd
-  data.tar.gz: 7f7aca10a0863e54cd797dbe2a8ec8252bf212c1
+  metadata.gz: d32b7b733ff8e0ad7bbfba5e03e4550f5688c991
+  data.tar.gz: 9fd2550bd78fdbd5a7d40ebee8e41cd0fe748a3d
 SHA512:
-  metadata.gz: bc85b86654502098091c7f2d5e8cc202f9520f608250f392ebaf7e0ccfb41a607ee915fd2f1621838a0f7460a9f9beb81d47710682b0981b72fa7dfa2d4b0728
-  data.tar.gz: 563d498b27eeedd2d76d62ed44642789640fdc9b101584c467d28f4828b0407aa03446958ecdaf72babdd7be46ed171ef2e23d110487dfbd1022089d899443bb
+  metadata.gz: 353d24ed6888fc0eb1aa81308a7d81390f87e8b51c67ae384b68982cc4cc493d3a3129dc53087c17459e69c8b641728c03a8033f1b2ca8aef653c0dfdd001858
+  data.tar.gz: 1a9d27b7d986f2249bc5536b0002ec17b5c0c2b1f9d638d1ccd144dc3079398ecc1b2b773ba79d2c5ed66a8a95fba8fafd77981b44fca338f463396ef7970fde

data/CHANGELOG

@@ -1,3 +1,22 @@
+Release 6.0.1
+-------------
+
+ * Adds Ubuntu 18.10 "Cosmic" packages.
+ * Skips trying to set oom score in LXC container environments. Closes GH-2143.
+ * Fixes an issue during the GLS startup handshake where ephemeral ports could be exhausted. Closes GH-2144.
+ * Updated Ruby versions used in precompiled binaries (used for e.g. gem installs) to include 2.5.3, and 2.4.5 (removed: 2.4.4).
+ * Bumps the preferred Nginx version to 1.15.8.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+    - Curl: 7.62.0 -> 7.63.0
+    - Git: 2.19.2 -> 2.20.1
+    - Gnupg: 2.2.11 -> 2.2.12
+    - libassuan: 2.5.1 -> 2.5.2
+    - libgpg_error: 1.32 -> 1.33
+    - Ruby: 2.4.4 -> 2.4.5, + 2.5.3
+    - RubyGems: 2.7.6 -> 3.0.1
+
+
 Release 6.0.0
 -------------
 

data/src/agent/Core/Config.h

@@ -157,7 +157,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/5.3.7")
+ *   server_software                                                 string             -          default("Phusion_Passenger/6.0.1")
  *   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

@@ -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/5.3.7")
+ *   server_software                                     string             -          default("Phusion_Passenger/6.0.1")
  *   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/Perform.h

@@ -202,6 +202,7 @@ private:
 				socketIsNowPingable = true;
 				finishState = FINISH_SUCCESS;
 				wakeupEventLoop();
+				break;
 			} else {
 				syscalls::usleep(50000);
 			}

data/src/agent/Watchdog/Config.h

@@ -146,7 +146,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/5.3.7")
+ *   server_software                                                          string             -          default("Phusion_Passenger/6.0.1")
  *   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

@@ -81,7 +81,7 @@
 #define PASSENGER_API_VERSION_MAJOR 0
 #define PASSENGER_API_VERSION_MINOR 3
 #define PASSENGER_DEFAULT_USER "nobody"
-#define PASSENGER_VERSION "6.0.0"
+#define PASSENGER_VERSION "6.0.1"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"

data/src/cxx_supportlib/SystemTools/ContainerHelpers.h

@@ -10,19 +10,73 @@
 #ifndef _PASSENGER_SYSTEM_TOOLS_CONTAINER_HELPERS_H_
 #define _PASSENGER_SYSTEM_TOOLS_CONTAINER_HELPERS_H_
 
+#include <unistd.h>
 #include <boost/predef.h>
 #include <FileTools/FileManip.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 
 using namespace std;
 
 
+// adapted from https://github.com/systemd/systemd/blob/042ca/src/basic/virt.c
+// separate function to keep as similar to source as possible for easier updates
+inline bool
+_linuxAutoDetectInContainer() {
+	// https://github.com/moby/moby/issues/26102#issuecomment-253621560
+	if (fileExists("/.dockerenv")) {
+		return true;
+	}
+
+	if (fileExists("/proc/vz") && !fileExists("/proc/bc")) {
+		return true;
+	}
+
+	const char *env = getenv("container");
+	if (env != NULL) {
+		return (*env != '\0');
+	}
+
+	if (fileExists("/run/systemd/container")) {
+		string file = unsafeReadFile("/run/systemd/container");
+		return (file.length() > 0);
+	}
+
+	if (fileExists("/proc/1/environ")) {
+		string file = unsafeReadFile("/proc/1/environ");
+		if (file.size() > 0) {
+			vector<string> v;
+			split(file,'\0', v);
+			for(vector<string>::iterator it = v.begin(); it != v.end(); ++it) {
+				if (startsWith(*it, "container=")) {
+					return true;
+				}
+			}
+		}
+	}
+
+	if (fileExists("/proc/1/sched")) {
+		string file = unsafeReadFile("/proc/1/sched");
+		if (file.length() >= 0) {
+			const char t = file[0];
+			if (t == '\0') {
+				return false;
+			}
+
+			if (!startsWith(file, "(1,")) {
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
 inline bool
 autoDetectInContainer() {
 	#if BOOST_OS_LINUX
-		// https://github.com/moby/moby/issues/26102#issuecomment-253621560
-		return fileExists("/.dockerenv");
+		return _linuxAutoDetectInContainer();
 	#else
 		return false;
 	#endif

data/src/nginx_module/Configuration.c

@@ -831,7 +831,7 @@ merge_headers(ngx_conf_t *cf, passenger_loc_conf_t *conf, passenger_loc_conf_t *
                 return NGX_ERROR;
             }
 
-            copy->code = (ngx_http_script_code_pt)
+            copy->code = (ngx_http_script_code_pt) (void *)
                                                  ngx_http_script_copy_len_code;
             copy->len = src[i].key.len + sizeof(": ") - 1
                         + src[i].value.len + sizeof(CRLF) - 1;
@@ -866,7 +866,7 @@ merge_headers(ngx_conf_t *cf, passenger_loc_conf_t *conf, passenger_loc_conf_t *
                 return NGX_ERROR;
             }
 
-            copy->code = (ngx_http_script_code_pt)
+            copy->code = (ngx_http_script_code_pt) (void *)
                                                  ngx_http_script_copy_len_code;
             copy->len = src[i].key.len + sizeof(": ") - 1;
 
@@ -907,7 +907,7 @@ merge_headers(ngx_conf_t *cf, passenger_loc_conf_t *conf, passenger_loc_conf_t *
                 return NGX_ERROR;
             }
 
-            copy->code = (ngx_http_script_code_pt)
+            copy->code = (ngx_http_script_code_pt) (void *)
                                                  ngx_http_script_copy_len_code;
             copy->len = sizeof(CRLF) - 1;
 

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,16 +31,16 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h configkit_schemas_inline_comments' after changing this number.
-  VERSION_STRING = '6.0.0'
+  VERSION_STRING = '6.0.1'
 
   # Tip: find the SHA-256 with ./dev/nginx_version_sha2 <VERSION>
-  PREFERRED_NGINX_VERSION = '1.15.7'
-  NGINX_SHA256_CHECKSUM = '8f22ea2f6c0e0a221b6ddc02b6428a3ff708e2ad55f9361102b1c9f4142bdf93'
+  PREFERRED_NGINX_VERSION = '1.15.8'
+  NGINX_SHA256_CHECKSUM = 'a8bdafbca87eb99813ae4fcac1ad0875bf725ce19eb265d28268c309b2b40787'
 
   # 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.15.7'
-  PACKAGING_NGINX_SHA256_CHECKSUM = '8f22ea2f6c0e0a221b6ddc02b6428a3ff708e2ad55f9361102b1c9f4142bdf93'
+  PACKAGING_PREFERRED_NGINX_VERSION = '1.15.8'
+  PACKAGING_NGINX_SHA256_CHECKSUM = 'a8bdafbca87eb99813ae4fcac1ad0875bf725ce19eb265d28268c309b2b40787'
 
   # sha256sum of the .tar.gz
   PREFERRED_PCRE_VERSION  = '8.42'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2019-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake