passenger 6.0.1 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d32b7b733ff8e0ad7bbfba5e03e4550f5688c991
-  data.tar.gz: 9fd2550bd78fdbd5a7d40ebee8e41cd0fe748a3d
+  metadata.gz: '0619ca90cabc94ee6b8801d143b14877ab15500d'
+  data.tar.gz: f65f9070719053192fcc50206cb146cd18dbba2f
 SHA512:
-  metadata.gz: 353d24ed6888fc0eb1aa81308a7d81390f87e8b51c67ae384b68982cc4cc493d3a3129dc53087c17459e69c8b641728c03a8033f1b2ca8aef653c0dfdd001858
-  data.tar.gz: 1a9d27b7d986f2249bc5536b0002ec17b5c0c2b1f9d638d1ccd144dc3079398ecc1b2b773ba79d2c5ed66a8a95fba8fafd77981b44fca338f463396ef7970fde
+  metadata.gz: 9e844139554498a4662950e649dcf56b768bc74f9a306ef070d13fa504e2f18869e701fd8ceb064aaba5bb4987277ee9910f8aaf2ec8135f60823645895a1965
+  data.tar.gz: 8b0bc8083d5a620506813ae1946fc900e3ae65016fcd552a5c8ea6273d0cf247482d676146eb889fa776b1059e91d4dc51249c9aa7a2c070120f2d9458e32992

data/CHANGELOG

@@ -1,3 +1,24 @@
+Release 6.0.2
+-------------
+
+ * Allow compilation to work when Apple messed up their system ruby headers.
+ * Only try to read pid 1's /proc files as root, in container detection. Closes GH-2168.
+ * Add an option to disable prefixing application logs with "App PID stdout": `PassengerDisableLogPrefix` (Apache) / `passenger_disable_log_prefix` (Nginx). Closes GH-1915.
+ * Add support for identifying the Passenger instance by PID. Closes GH-2146. Contributed by Saverio Miroddi (@saveriomiroddi).
+ * [Ruby] Made Passenger more resiliant to Rack bugs. Closes GH-2150.
+ * [Nginx] Do not touch Nginx's proxy_temp_path var in Passenger's nginx modules. Closes GH-2075. Contributed by Roman Berestnikov-Sivolov (@ROMB).
+ * Updated Ruby versions used in precompiled binaries (used for e.g. gem installs) to include 2.6.1.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+    - Curl: 7.64.0 (was: 7.63.0)
+    - Ruby: 2.6.1 (was: 2.6.0)
+    - RubyGems 3.0.2 (was: 3.0.1)
+    - ccache 3.6 (was: 3.5)
+    - GnuPG 2.2.13 (was: 2.2.12)
+    - libassuan 2.5.3 (was: 2.5.2)
+    - libgpg_error 1.35 (was: 1.33)
+
+
 Release 6.0.1
 -------------
 

data/CONTRIBUTORS

@@ -40,6 +40,7 @@ Gokulnath Manakkattil
 Gregory Potamianos
 Hongli Lai (Phusion)
 Ian Ehlert
+Ian Kottman
 Igor Vuk
 isaac
 Isaac Reuben
@@ -87,11 +88,13 @@ Richard Michael
 Rob Paisley
 Robin Bowes
 Romain Tartière
+ROMB
 Ruslan Ermilov (NGINX Inc)
 Ryan Schwartz
 Ryo Onodera
 Saimon Moore
 Sam Pohlenz
+Saverio Miroddi
 Sean Wilkinson
 Sebastian Delmont
 Sebastian Welther

data/bin/passenger-status

@@ -55,6 +55,8 @@ DEFAULT_OPTIONS = { :show => 'pool', :color => STDOUT.tty? }.freeze
 def command_show_status(argv, options)
   if argv.empty?
     instance = find_sole_instance
+  elsif options[:pid_identifier]
+    instance = find_instance_by_watchdog_pid(argv[0].to_i)
   else
     instance = find_instance_by_name_prefix(argv[0])
   end
@@ -100,6 +102,16 @@ def find_instance_by_name_prefix(name)
   end
 end
 
+def find_instance_by_watchdog_pid(pid)
+  instance = InstanceRegistry.new.find_by_watchdog_pid(pid)
+
+  if instance
+    return instance
+  else
+    abort "ERROR: there doesn't seem to be a #{PROGRAM_NAME} instance running with the pid #{pid}."
+  end
+end
+
 def show_status(instance, options)
   # if the noshow override is not specified, the default is to show the header, unless show=xml
   if options[:noheader] != true && options[:show] != 'xml'
@@ -292,6 +304,9 @@ def create_option_parser(options)
     opts.on("--force-colors", "Display colors even if stdout is not a TTY") do
       options[:color] = true
     end
+    opts.on("--pid-identifier", "Identify instance by [Watchdog] PID, rather than name.") do
+      options[:pid_identifier] = true
+    end
     opts.on("--verbose", "-v", "Show verbose information.") do
       options[:verbose] = true
     end

data/build/misc.rb

@@ -143,6 +143,8 @@ task :contributors do
   entries.push "Floor Drees (Phusion)"
   entries.delete "Luuk Hafkamp"
   entries.push "Luuk Hafkamp (Phusion)"
+  entries.delete "Luuk Hendriks"
+  entries.push "Luuk Hendriks (Phusion)"
 
   # Non-employee contributors
   entries.push "Ruslan Ermilov (NGINX Inc)"
@@ -152,7 +154,7 @@ task :contributors do
   entries.push "Yichun Zhang"
 
   File.open("CONTRIBUTORS", "w") do |f|
-    f.puts(entries.sort{ |a, b| a.downcase <=> b.downcase }.join("\n"))
+    f.puts(entries.sort{ |a, b| a.downcase <=> b.downcase }.uniq.join("\n"))
   end
   puts "Updated CONTRIBUTORS"
 end

data/resources/templates/standalone/http.erb

@@ -27,6 +27,7 @@ passenger_user_switching off;
 <%= nginx_http_option(:python) %>
 <%= nginx_http_option(:nodejs) %>
 <%= nginx_http_option(:log_level) %>
+<%= nginx_http_option(:disable_log_prefix) %>
 <%= nginx_http_option(:max_pool_size) %>
 <%= nginx_http_option(:pool_idle_time) %>
 <%= nginx_http_option(:max_preloader_idle_time) %>

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/6.0.1")
+ *   server_software                                                 string             -          default("Phusion_Passenger/6.0.2")
  *   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/6.0.1")
+ *   server_software                                     string             -          default("Phusion_Passenger/6.0.2")
  *   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/CoreMain.cpp

@@ -912,7 +912,7 @@ initializeAdminPanelConnector() {
 	TRACE_POINT();
 	WorkingObjects &wo = *workingObjects;
 
-	if (coreConfig->get("admin_panel_url").isNull()) {
+	if (coreConfig->get("admin_panel_url").empty()) {
 		return;
 	}
 

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/6.0.1")
+ *   server_software                                                          string             -          default("Phusion_Passenger/6.0.2")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only

data/src/apache2_module/ConfigGeneral/AutoGeneratedDefinitions.cpp

@@ -177,6 +177,11 @@ extern "C" const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"Whether to disable Phusion Passenger anonymous telemetry."),
+	AP_INIT_FLAG("PassengerDisableLogPrefix",
+		(FlagFunc) cmd_passenger_disable_log_prefix,
+		NULL,
+		RSRC_CONF,
+		"Disable prefixing log statements with PID and channel."),
 	AP_INIT_FLAG("PassengerDisableSecurityUpdateCheck",
 		(FlagFunc) cmd_passenger_disable_security_update_check,
 		NULL,

data/src/apache2_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.cpp

@@ -73,6 +73,11 @@ ConfigManifestGenerator::autoGenerated_setGlobalConfigDefaults() {
 		"PassengerDisableAnonymousTelemetry",
 		false);
 
+	addOptionsContainerStaticDefaultBool(
+		globalConfigContainer,
+		"PassengerDisableLogPrefix",
+		false);
+
 	addOptionsContainerStaticDefaultBool(
 		globalConfigContainer,
 		"PassengerDisableSecurityUpdateCheck",

data/src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp

@@ -334,6 +334,21 @@ cmd_passenger_disable_anonymous_telemetry(cmd_parms *cmd, void *pcfg, const char
 	return NULL;
 }
 
+static const char *
+cmd_passenger_disable_log_prefix(cmd_parms *cmd, void *pcfg, const char *arg) {
+	const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+	if (err != NULL) {
+		ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->temp_pool,
+			"WARNING: %s", err);
+	}
+
+	serverConfig.disableLogPrefixSourceFile = cmd->directive->filename;
+	serverConfig.disableLogPrefixSourceLine = cmd->directive->line_num;
+	serverConfig.disableLogPrefixExplicitlySet = true;
+	serverConfig.disableLogPrefix = arg != NULL;
+	return NULL;
+}
+
 static const char *
 cmd_passenger_disable_security_update_check(cmd_parms *cmd, void *pcfg, const char *arg) {
 	const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);

data/src/apache2_module/Hooks.cpp

@@ -1354,6 +1354,7 @@ public:
 		config["admin_panel_auth_type"] = nonEmptyString(serverConfig.adminPanelAuthType);
 		config["admin_panel_username"] = nonEmptyString(serverConfig.adminPanelUsername);
 		config["admin_panel_password"] = nonEmptyString(serverConfig.adminPanelPassword);
+		config["disable_log_prefix"] = serverConfig.disableLogPrefix;
 
 		if (!serverConfig.logFile.empty()) {
 			config["log_target"] = serverConfig.logFile.toString();

data/src/apache2_module/ServerConfig/AutoGeneratedManifestGeneration.cpp

@@ -155,6 +155,15 @@ ConfigManifestGenerator::autoGenerated_generateConfigManifestForServerConfig() {
 			serverConfig.disableAnonymousTelemetrySourceLine);
 		hierarchyMember["value"] = serverConfig.disableAnonymousTelemetry == Apache2Module::ENABLED;
 	}
+	if (serverConfig.disableLogPrefixExplicitlySet) {
+		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
+			"PassengerDisableLogPrefix",
+			sizeof("PassengerDisableLogPrefix") - 1);
+		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
+			serverConfig.disableLogPrefixSourceFile,
+			serverConfig.disableLogPrefixSourceLine);
+		hierarchyMember["value"] = serverConfig.disableLogPrefix == Apache2Module::ENABLED;
+	}
 	if (serverConfig.disableSecurityUpdateCheckExplicitlySet) {
 		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
 			"PassengerDisableSecurityUpdateCheck",

data/src/apache2_module/ServerConfig/AutoGeneratedStruct.h

@@ -62,6 +62,11 @@ struct AutoGeneratedServerConfig {
 	 */
 	bool disableAnonymousTelemetry;
 
+	/*
+	 * Disable prefixing log statements with PID and channel.
+	 */
+	bool disableLogPrefix;
+
 	/*
 	 * Whether to disable the Phusion Passenger security update check & notification.
 	 */
@@ -199,6 +204,7 @@ struct AutoGeneratedServerConfig {
 
 
 	StaticString disableAnonymousTelemetrySourceFile;
+	StaticString disableLogPrefixSourceFile;
 	StaticString disableSecurityUpdateCheckSourceFile;
 	StaticString showVersionInHeaderSourceFile;
 	StaticString turbocachingSourceFile;
@@ -228,6 +234,7 @@ struct AutoGeneratedServerConfig {
 	StaticString prestartURLsSourceFile;
 
 	unsigned int disableAnonymousTelemetrySourceLine;
+	unsigned int disableLogPrefixSourceLine;
 	unsigned int disableSecurityUpdateCheckSourceLine;
 	unsigned int showVersionInHeaderSourceLine;
 	unsigned int turbocachingSourceLine;
@@ -257,6 +264,7 @@ struct AutoGeneratedServerConfig {
 	unsigned int prestartURLsSourceLine;
 
 	bool disableAnonymousTelemetryExplicitlySet: 1;
+	bool disableLogPrefixExplicitlySet: 1;
 	bool disableSecurityUpdateCheckExplicitlySet: 1;
 	bool showVersionInHeaderExplicitlySet: 1;
 	bool turbocachingExplicitlySet: 1;
@@ -288,6 +296,7 @@ struct AutoGeneratedServerConfig {
 
 	AutoGeneratedServerConfig() {
 		disableAnonymousTelemetry = false;
+		disableLogPrefix = false;
 		disableSecurityUpdateCheck = false;
 		showVersionInHeader = true;
 		turbocaching = true;
@@ -345,6 +354,7 @@ struct AutoGeneratedServerConfig {
 		 */
 
 		disableAnonymousTelemetrySourceLine = 0;
+		disableLogPrefixSourceLine = 0;
 		disableSecurityUpdateCheckSourceLine = 0;
 		showVersionInHeaderSourceLine = 0;
 		turbocachingSourceLine = 0;
@@ -374,6 +384,7 @@ struct AutoGeneratedServerConfig {
 		prestartURLsSourceLine = 0;
 
 		disableAnonymousTelemetryExplicitlySet = false;
+		disableLogPrefixExplicitlySet = false;
 		disableSecurityUpdateCheckExplicitlySet = false;
 		showVersionInHeaderExplicitlySet = false;
 		turbocachingExplicitlySet = false;

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.1"
+#define PASSENGER_VERSION "6.0.2"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"

data/src/cxx_supportlib/LoggingKit/Config.h

@@ -88,6 +88,7 @@ struct ConfigRealization {
 	FdClosePolicy targetFdClosePolicy;
 	FdClosePolicy fileDescriptorLogTargetFdClosePolicy;
 	bool finalized;
+	bool disableLogPrefix;
 
 	ConfigRealization(const ConfigKit::Store &store);
 	~ConfigRealization();

data/src/cxx_supportlib/LoggingKit/Implementation.cpp

@@ -409,16 +409,18 @@ realLogAppOutput(const HashedStaticString &groupName, int targetFd,
 	const char *pidStr, unsigned int pidStrLen,
 	const char *channelName, unsigned int channelNameLen,
 	const char *message, unsigned int messageLen, int appLogFile,
-	bool saveLog)
+	bool saveLog, bool prefixLogs)
 {
 	char *pos = buf;
 	char *end = buf + bufSize;
 
-	pos = appendData(pos, end, "App ");
-	pos = appendData(pos, end, pidStr, pidStrLen);
-	pos = appendData(pos, end, " ");
-	pos = appendData(pos, end, channelName, channelNameLen);
-	pos = appendData(pos, end, ": ");
+	if (prefixLogs) {
+		pos = appendData(pos, end, "App ");
+		pos = appendData(pos, end, pidStr, pidStrLen);
+		pos = appendData(pos, end, " ");
+		pos = appendData(pos, end, channelName, channelNameLen);
+		pos = appendData(pos, end, ": ");
+	}
 	pos = appendData(pos, end, message, messageLen);
 	pos = appendData(pos, end, "\n");
 
@@ -437,6 +439,7 @@ logAppOutput(const HashedStaticString &groupName, pid_t pid, const StaticString
 {
 	int targetFd;
 	bool saveLog = false;
+	bool prefixLogs = true;
 
 	if (OXT_LIKELY(context != NULL)) {
 		const ConfigRealization *configRealization = context->getConfigRealization();
@@ -446,6 +449,7 @@ logAppOutput(const HashedStaticString &groupName, pid_t pid, const StaticString
 
 		targetFd = configRealization->targetFd;
 		saveLog = configRealization->saveLog;
+		prefixLogs = !configRealization->disableLogPrefix;
 	} else {
 		targetFd = STDERR_FILENO;
 	}
@@ -476,14 +480,14 @@ logAppOutput(const HashedStaticString &groupName, pid_t pid, const StaticString
 			buf, sizeof(buf),
 			pidStr, pidStrLen,
 			channelName.data(), channelName.size(),
-			message, size, fd, saveLog);
+			message, size, fd, saveLog, prefixLogs);
 	} else {
 		DynamicBuffer buf(totalLen);
 		realLogAppOutput(groupName, targetFd,
 			buf.data, totalLen,
 			pidStr, pidStrLen,
 			channelName.data(), channelName.size(),
-			message, size, fd, saveLog);
+			message, size, fd, saveLog, prefixLogs);
 	}
 	if(fd > -1){close(fd);}
 }
@@ -778,6 +782,7 @@ Schema::Schema() {
 	add("redirect_stderr", BOOL_TYPE, OPTIONAL, true);
 	add("app_output_log_level", STRING_TYPE, OPTIONAL, DEFAULT_APP_OUTPUT_LOG_LEVEL_NAME);
 	add("buffer_logs", BOOL_TYPE, OPTIONAL, false);
+	add("disable_log_prefix", BOOL_TYPE, OPTIONAL, false);
 
 	addValidator(boost::bind(validateLogLevel, "level",
 		boost::placeholders::_1, boost::placeholders::_2));
@@ -798,7 +803,8 @@ ConfigRealization::ConfigRealization(const ConfigKit::Store &store)
 	: level(parseLevel(store["level"].asString())),
 	  appOutputLogLevel(parseLevel(store["app_output_log_level"].asString())),
 	  saveLog(store["buffer_logs"].asBool()),
-	  finalized(false)
+	  finalized(false),
+	  disableLogPrefix(store["disable_log_prefix"].asBool())
 {
 	if (store["target"].isMember("stderr")) {
 		targetType = STDERR_TARGET;

data/src/cxx_supportlib/SystemTools/ContainerHelpers.h

@@ -43,33 +43,34 @@ _linuxAutoDetectInContainer() {
 		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 (getuid() == 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 (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;
+				if (!startsWith(file, "(1,")) {
+					return true;
+				}
 			}
 		}
 	}
-
 	return false;
 }
 

data/src/nginx_module/ConfigGeneral/AutoGeneratedDefinitions.c

@@ -86,6 +86,14 @@
     offsetof(passenger_main_conf_t, autogenerated.log_file),
     NULL
 },
+{
+    ngx_string("passenger_disable_log_prefix"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_FLAG,
+    passenger_conf_set_disable_log_prefix,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.disable_log_prefix),
+    NULL
+},
 {
     ngx_string("passenger_file_descriptor_log_file"),
     NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,

data/src/nginx_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.c

@@ -61,6 +61,12 @@ set_manifest_autogenerated_global_conf_defaults(manifest_gen_ctx_t *ctx) {
         "Nginx's global error log",
         sizeof("Nginx's global error log") - 1);
 
+    add_manifest_options_container_static_default_bool(ctx,
+        ctx->global_config_container,
+        "passenger_disable_log_prefix",
+        sizeof("passenger_disable_log_prefix") - 1,
+        0);
+
     add_manifest_options_container_dynamic_default(ctx,
         ctx->global_config_container,
         "passenger_data_buffer_dir",

data/src/nginx_module/ConfigGeneral/AutoGeneratedSetterFuncs.c

@@ -145,6 +145,18 @@ passenger_conf_set_log_file(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     return ngx_conf_set_str_slot(cf, cmd, conf);
 }
 
+static char *
+passenger_conf_set_disable_log_prefix(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    passenger_main_conf_t *passenger_conf = conf;
+
+    passenger_conf->autogenerated.disable_log_prefix_explicitly_set = 1;
+    record_main_conf_source_location(cf,
+        &passenger_conf->autogenerated.disable_log_prefix_source_file,
+        &passenger_conf->autogenerated.disable_log_prefix_source_line);
+
+    return ngx_conf_set_flag_slot(cf, cmd, conf);
+}
+
 static char *
 passenger_conf_set_file_descriptor_log_file(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_main_conf_t *passenger_conf = conf;

data/src/nginx_module/Configuration.c

@@ -61,10 +61,6 @@ static ngx_str_t headers_to_hide[] = {
 
 passenger_main_conf_t passenger_main_conf;
 
-static ngx_path_init_t  ngx_http_proxy_temp_path = {
-    ngx_string(NGX_HTTP_PROXY_TEMP_PATH), { 1, 2, 0 }
-};
-
 
 static ngx_int_t merge_headers(ngx_conf_t *cf, passenger_loc_conf_t *conf,
     passenger_loc_conf_t *prev);
@@ -577,11 +573,6 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
                                        |NGX_HTTP_UPSTREAM_FT_OFF;
     }
 
-    ngx_conf_merge_path_value(cf,
-                              &conf->upstream_config.temp_path,
-                              prev->upstream_config.temp_path,
-                              &ngx_http_proxy_temp_path);
-
 #if (NGX_HTTP_CACHE)
 
     #if NGINX_VERSION_NUM >= 1007009

data/src/nginx_module/MainConfig/AutoGeneratedCreateFunction.c

@@ -49,6 +49,7 @@ passenger_create_autogenerated_main_conf(passenger_autogenerated_main_conf_t *co
     conf->log_level = NGX_CONF_UNSET_UINT;
     conf->log_file.data = NULL;
     conf->log_file.len  = 0;
+    conf->disable_log_prefix = NGX_CONF_UNSET;
     conf->file_descriptor_log_file.data = NULL;
     conf->file_descriptor_log_file.len  = 0;
     conf->data_buffer_dir.data = NULL;
@@ -110,6 +111,10 @@ passenger_create_autogenerated_main_conf(passenger_autogenerated_main_conf_t *co
     conf->log_file_source_file.len = 0;
     conf->log_file_source_line = 0;
     conf->log_file_explicitly_set = 0;
+    conf->disable_log_prefix_source_file.data = NULL;
+    conf->disable_log_prefix_source_file.len = 0;
+    conf->disable_log_prefix_source_line = 0;
+    conf->disable_log_prefix_explicitly_set = 0;
     conf->file_descriptor_log_file_source_file.data = NULL;
     conf->file_descriptor_log_file_source_file.len = 0;
     conf->file_descriptor_log_file_source_line = 0;

data/src/nginx_module/MainConfig/AutoGeneratedManifestGeneration.c

@@ -113,6 +113,17 @@ generate_config_manifest_for_autogenerated_main_conf(manifest_gen_ctx_t *ctx, pa
             (const char *) conf->autogenerated.log_file.data,
             conf->autogenerated.log_file.len);
     }
+    if (conf->autogenerated.disable_log_prefix_explicitly_set) {
+        option_container = find_or_create_manifest_option_container(ctx,
+            ctx->global_config_container,
+            "passenger_disable_log_prefix",
+            sizeof("passenger_disable_log_prefix") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &conf->autogenerated.disable_log_prefix_source_file,
+            conf->autogenerated.disable_log_prefix_source_line);
+        psg_json_value_set_bool(hierarchy_member, "value",
+            conf->autogenerated.disable_log_prefix);
+    }
     if (conf->autogenerated.file_descriptor_log_file_explicitly_set) {
         option_container = find_or_create_manifest_option_container(ctx,
             ctx->global_config_container,

data/src/nginx_module/MainConfig/AutoGeneratedStruct.h

@@ -44,6 +44,7 @@ typedef struct {
     ngx_uint_t core_file_descriptor_ulimit;
     ngx_array_t *ctl;
     ngx_flag_t disable_anonymous_telemetry;
+    ngx_flag_t disable_log_prefix;
     ngx_flag_t disable_security_update_check;
     ngx_uint_t log_level;
     ngx_uint_t max_instances_per_app;
@@ -84,6 +85,7 @@ typedef struct {
     ngx_str_t default_group_source_file;
     ngx_str_t default_user_source_file;
     ngx_str_t disable_anonymous_telemetry_source_file;
+    ngx_str_t disable_log_prefix_source_file;
     ngx_str_t disable_security_update_check_source_file;
     ngx_str_t dump_config_manifest_source_file;
     ngx_str_t file_descriptor_log_file_source_file;
@@ -116,6 +118,7 @@ typedef struct {
     ngx_uint_t default_group_source_line;
     ngx_uint_t default_user_source_line;
     ngx_uint_t disable_anonymous_telemetry_source_line;
+    ngx_uint_t disable_log_prefix_source_line;
     ngx_uint_t disable_security_update_check_source_line;
     ngx_uint_t dump_config_manifest_source_line;
     ngx_uint_t file_descriptor_log_file_source_line;
@@ -148,6 +151,7 @@ typedef struct {
     ngx_int_t default_group_explicitly_set;
     ngx_int_t default_user_explicitly_set;
     ngx_int_t disable_anonymous_telemetry_explicitly_set;
+    ngx_int_t disable_log_prefix_explicitly_set;
     ngx_int_t disable_security_update_check_explicitly_set;
     ngx_int_t dump_config_manifest_explicitly_set;
     ngx_int_t file_descriptor_log_file_explicitly_set;

data/src/nginx_module/ngx_http_passenger_module.c

@@ -362,6 +362,7 @@ start_watchdog(ngx_cycle_t *cycle) {
     psg_json_value_set_value     (w_config, "config_manifest", -1, passenger_main_conf.manifest);
     psg_json_value_set_ngx_uint  (w_config, "log_level", autogenerated_main_conf->log_level);
     psg_json_value_set_ngx_str_ne(w_config, "file_descriptor_log_target", &autogenerated_main_conf->file_descriptor_log_file);
+    psg_json_value_set_ngx_flag  (w_config, "disable_log_prefix", autogenerated_main_conf->disable_log_prefix);
     psg_json_value_set_ngx_uint  (w_config, "core_file_descriptor_ulimit", autogenerated_main_conf->core_file_descriptor_ulimit);
     psg_json_value_set_ngx_uint  (w_config, "controller_socket_backlog", autogenerated_main_conf->socket_backlog);
     psg_json_value_set_ngx_str_ne(w_config, "controller_file_buffered_channel_buffer_dir", &autogenerated_main_conf->data_buffer_dir);

data/src/ruby_native_extension/extconf.rb

@@ -21,6 +21,13 @@
 #  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
+
+# Apple has a habit of getting their Ruby headers wrong, so if we are building using system ruby we need to patch things up, sierra & mojave both did this.
+# eg https://openradar.appspot.com/46465917
+if RUBY_PLATFORM =~ /darwin/ && !File.exists?(RbConfig::CONFIG["rubyarchhdrdir"])
+  RbConfig::CONFIG["rubyarchhdrdir"].sub!(RUBY_PLATFORM.split('-').last, Dir.entries(File.dirname(RbConfig::CONFIG["rubyarchhdrdir"])).reject{|d|d.start_with?(".","ruby")}.first.split('-').last)
+end
+
 require 'mkmf'
 
 $LIBS << " -lpthread" if $LIBS !~ /-lpthread/

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,7 +31,7 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h configkit_schemas_inline_comments' after changing this number.
-  VERSION_STRING = '6.0.1'
+  VERSION_STRING = '6.0.2'
 
   # Tip: find the SHA-256 with ./dev/nginx_version_sha2 <VERSION>
   PREFERRED_NGINX_VERSION = '1.15.8'

data/src/ruby_supportlib/phusion_passenger/admin_tools/instance_registry.rb

@@ -82,6 +82,14 @@ module PhusionPassenger
         end
       end
 
+      # :watchdog_pid: expected Integer.
+      #
+      # return: the matching instance, if found; nil otherwise.
+      #
+      def find_by_watchdog_pid(pid, options = {})
+        return list(options).detect { |instance| instance.watchdog_pid == pid }
+      end
+
     private
       def default_paths
         if result = string_env("PASSENGER_INSTANCE_REGISTRY_DIR")

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

@@ -137,6 +137,13 @@ APACHE2_CONFIGURATION_OPTIONS = [
     :dynamic_default => "Apache's global error log",
     :desc      => "The #{PROGRAM_NAME} log file."
   },
+  {
+    :name      => 'PassengerDisableLogPrefix',
+    :type      => :flag,
+    :context   => :global,
+    :default   => false,
+    :desc      => "Disable prefixing log statements with PID and channel."
+  },
   {
     :name      => 'PassengerSocketBacklog',
     :type      => :integer,

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

@@ -154,6 +154,14 @@ NGINX_CONFIGURATION_OPTIONS = [
     :context  => [:main],
     :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
   },
+  {
+    :name     => 'passenger_disable_log_prefix',
+    :scope    => :global,
+    :type     => :flag,
+    :default  => false,
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
   {
     :name     => 'passenger_file_descriptor_log_file',
     :scope    => :global,

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

@@ -557,6 +557,11 @@ module PhusionPassenger
         :default   => DEFAULT_LOG_LEVEL,
         :desc      => "Log level to use. Default: #{DEFAULT_LOG_LEVEL}"
       },
+      {
+        :name      => :disable_log_prefix,
+        :type      => :boolean,
+        :desc      => "Disable prefixing log statements with PID and channel."
+      },
       {
         :name      => :admin_panel_url,
         :type      => :string,

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

@@ -111,6 +111,7 @@ module PhusionPassenger
           add_param(command, :instance_registry_dir, "--instance-registry-dir")
           add_param(command, :data_buffer_dir, "--data-buffer-dir")
           add_param(command, :log_level, "--log-level")
+          add_flag_param(command, :disable_log_prefix, "--disable-log-prefix")
           @options[:ctls].each do |ctl|
             command << " --ctl #{Shellwords.escape ctl}"
           end

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

@@ -191,6 +191,12 @@ class TeeInput
     self # Rack does not specify what the return value is here
   end
 
+  # Rack repeatedly introduces bugs that rely on this method existing
+  # https://github.com/rack/rack/pull/1201
+  def eof?
+    socket_drained?
+  end
+
 private
 
   def socket_drained?

metadata

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