passenger 4.0.19 → 4.0.20

data/ext/common/agents/Watchdog/Main.cpp

@@ -98,6 +98,7 @@ struct WorkingObjects {
 	ServerInstanceDir::GenerationPtr generation;
 	uid_t defaultUid;
 	gid_t defaultGid;
+	vector<string> cleanupPidfiles;
 	string loggingAgentAddress;
 	string loggingAgentPassword;
 	string loggingAgentAdminAddress;
@@ -271,13 +272,41 @@ waitForStarterProcessOrWatchers(const WorkingObjectsPtr &wo, vector<AgentWatcher
 	}
 }
 
+static vector<pid_t>
+readCleanupPids(const WorkingObjectsPtr &wo) {
+	vector<pid_t> result;
+
+	foreach (string filename, wo->cleanupPidfiles) {
+		FILE *f = fopen(filename.c_str(), "r");
+		if (f != NULL) {
+			char buf[33];
+			size_t ret;
+
+			ret = fread(buf, 1, 32, f);
+			if (ret > 0) {
+				buf[ret] = '\0';
+				result.push_back(atoi(buf));
+			} else {
+				P_WARN("Cannot read cleanup PID file " << filename);
+			}
+		} else {
+			P_WARN("Cannot open cleanup PID file " << filename);
+		}
+	}
+
+	return result;
+}
+
 static void
 cleanupAgentsInBackground(const WorkingObjectsPtr &wo, vector<AgentWatcherPtr> &watchers, char *argv[]) {
 	this_thread::disable_interruption di;
 	this_thread::disable_syscall_interruption dsi;
+	vector<pid_t> cleanupPids;
 	pid_t pid;
 	int e;
 
+	cleanupPids = readCleanupPids(wo);
+
 	pid = fork();
 	if (pid == 0) {
 		// Child
@@ -345,6 +374,12 @@ cleanupAgentsInBackground(const WorkingObjectsPtr &wo, vector<AgentWatcherPtr> &
 		// Now clean up the server instance directory.
 		delete wo->generation.get();
 		delete wo->serverInstanceDir.get();
+
+		// Notify given PIDs about our shutdown.
+		foreach (pid_t pid, cleanupPids) {
+			P_DEBUG("Sending SIGTERM to cleanup PID " << pid);
+			kill(pid, SIGTERM);
+		}
 		
 		_exit(0);
 		
@@ -519,6 +554,9 @@ initializeWorkingObjects(WorkingObjectsPtr &wo, ServerInstanceDirToucherPtr &ser
 	UPDATE_TRACE_POINT();
 	lookupDefaultUidGid(wo->defaultUid, wo->defaultGid);
 
+	UPDATE_TRACE_POINT();
+	wo->cleanupPidfiles = agentsOptions.getStrSet("cleanup_pidfiles", false);
+
 	UPDATE_TRACE_POINT();
 	wo->loggingAgentAddress  = "unix:" + wo->generation->getPath() + "/logging";
 	wo->loggingAgentPassword = wo->randomGenerator.generateAsciiString(64);

data/ext/nginx/CacheLocationConfig.c

@@ -26,7 +26,7 @@
 /*
  * CacheLocationConfig.c is automatically generated from CacheLocationConfig.c.erb,
  * using definitions from lib/phusion_passenger/nginx/config_options.rb.
- * Edits to MergeLocationConfig.c will be lost.
+ * Edits to CacheLocationConfig.c will be lost.
  *
  * To update CacheLocationConfig.c:
  *   rake nginx
@@ -179,6 +179,13 @@ u_char int_buf[32], *end, *buf, *pos;
 	
 
 	
+		if (conf->load_shell_envvars != NGX_CONF_UNSET) {
+			len += 29;
+			len += conf->load_shell_envvars ? sizeof("true") : sizeof("false");
+		}
+	
+
+	
 		if (conf->union_station_key.data != NULL) {
 			len += 18;
 			len += conf->union_station_key.len + 1;
@@ -450,6 +457,19 @@ buf = pos = ngx_pnalloc(cf->pool, len);
 	
 
 	
+		if (conf->load_shell_envvars != NGX_CONF_UNSET) {
+			pos = ngx_copy(pos,
+				"PASSENGER_LOAD_SHELL_ENVVARS",
+				29);
+			if (conf->load_shell_envvars) {
+				pos = ngx_copy(pos, "true", sizeof("true"));
+			} else {
+				pos = ngx_copy(pos, "false", sizeof("false"));
+			}
+		}
+	
+
+	
 		if (conf->union_station_key.data != NULL) {
 			pos = ngx_copy(pos,
 				"UNION_STATION_KEY",

data/ext/nginx/CacheLocationConfig.c.erb

@@ -26,7 +26,7 @@
 /*
  * CacheLocationConfig.c is automatically generated from CacheLocationConfig.c.erb,
  * using definitions from lib/phusion_passenger/nginx/config_options.rb.
- * Edits to MergeLocationConfig.c will be lost.
+ * Edits to CacheLocationConfig.c will be lost.
  *
  * To update CacheLocationConfig.c:
  *   rake nginx

data/ext/nginx/ConfigurationCommands.c

@@ -329,6 +329,16 @@
 	NULL
 },
 
+{
+	
+	ngx_string("passenger_load_shell_envvars"),
+	NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
+	ngx_conf_set_flag_slot,
+	NGX_HTTP_LOC_CONF_OFFSET,
+	offsetof(passenger_loc_conf_t, load_shell_envvars),
+	NULL
+},
+
 {
 	
 	ngx_string("union_station_key"),

data/ext/nginx/ConfigurationFields.h

@@ -39,51 +39,53 @@
 
 
 
+	ngx_array_t *base_uris;
+
+	ngx_int_t debugger;
+
 	ngx_int_t enabled;
 
-	ngx_int_t max_request_queue_size;
+	ngx_int_t friendly_error_pages;
 
-	ngx_array_t *vars_source;
+	ngx_int_t load_shell_envvars;
 
 	ngx_int_t max_preloader_idle_time;
 
-	ngx_int_t friendly_error_pages;
-
-	ngx_int_t min_instances;
+	ngx_int_t max_request_queue_size;
 
 	ngx_int_t max_requests;
 
-	ngx_int_t start_timeout;
+	ngx_int_t min_instances;
 
-	ngx_array_t *base_uris;
+	ngx_int_t request_queue_overflow_status_code;
 
 	ngx_int_t show_version_in_header;
 
-	ngx_int_t debugger;
+	ngx_int_t start_timeout;
 
 	ngx_array_t *union_station_filters;
 
 	ngx_int_t union_station_support;
 
-	ngx_int_t request_queue_overflow_status_code;
-
-	ngx_str_t app_rights;
+	ngx_array_t *vars_source;
 
 	ngx_str_t app_group_name;
 
-	ngx_str_t group;
+	ngx_str_t app_rights;
 
-	ngx_str_t user;
+	ngx_str_t app_root;
 
 	ngx_str_t environment;
 
+	ngx_str_t group;
+
 	ngx_str_t python;
 
+	ngx_str_t ruby;
+
 	ngx_str_t spawn_method;
 
 	ngx_str_t union_station_key;
 
-	ngx_str_t ruby;
-
-	ngx_str_t app_root;
+	ngx_str_t user;
 

data/ext/nginx/ConfigurationFields.h.erb

@@ -49,22 +49,22 @@ end
 
 def struct_field_for(option)
 	if option.has_key?(:field)
-		return option[:field]
+		return option[:field].to_s
 	else
 		return option[:name].sub(/^passenger_/, '')
 	end
 end
 
-# Returns [definition_source, estimated_size_on_x86_64]
+# Returns [definition_source, estimated_size_on_x86_64, field_name]
 def definition_for(option)
 	field = struct_field_for(option)
 	case option[:type]
 	when :string
-		return ["ngx_str_t #{field}", 8 + 4]
+		return ["ngx_str_t #{field}", 8 + 4, field]
 	when :integer, :flag
-		return ["ngx_int_t #{field}", 8]
+		return ["ngx_int_t #{field}", 8, field]
 	when :string_array, :string_keyval
-		return ["ngx_array_t *#{field}", 8];
+		return ["ngx_array_t *#{field}", 8, field];
 	else
 		raise "Unknown option type #{option[:type].inspect} for option #{option[:name]}"
 	end
@@ -76,7 +76,12 @@ definitions = eligible_options.map { |o| definition_for(o) }
 # It's possible to make it even smaller with a smarter algorithm but for now
 # I don't bother.
 definitions.sort! do |d1, d2|
-	d1[1] <=> d2[1]
+	if d1[1] == d2[1]
+		# After sorting on size, sort alphabetically.
+		d1[2] <=> d2[2]
+	else
+		d1[1] <=> d2[1]
+	end
 end
 %>
 

data/ext/nginx/CreateLocationConfig.c

@@ -133,6 +133,10 @@
 	
 
 	
+		conf->load_shell_envvars = NGX_CONF_UNSET;
+	
+
+	
 		conf->union_station_key.data = NULL;
 		conf->union_station_key.len  = 0;
 	

data/ext/nginx/MergeLocationConfig.c

@@ -148,6 +148,12 @@
 	
 
 	
+		ngx_conf_merge_value(conf->load_shell_envvars,
+			prev->load_shell_envvars,
+			NGX_CONF_UNSET);
+	
+
+	
 		ngx_conf_merge_str_value(conf->union_station_key,
 			prev->union_station_key,
 			NULL);

data/helper-scripts/node-loader.js

@@ -226,16 +226,20 @@ function RequestHandler(readyCallback, clientCallback) {
 
 		function handleData(data) {
 			if (state == 'PARSING_HEADER') {
-				parser.feed(data);
+				var consumed = parser.feed(data);
 				if (parser.state == SPP_DONE) {
 					state = 'HEADER_SEEN';
+					socket.removeListener('data', handleData);
 					PhusionPassenger.emit('request', parser, socket);
+					if (consumed != data.length) {
+						socket.emit('data', data.slice(consumed));
+					}
 				} else if (parser.state == SPP_ERROR) {
 					console.error('Header parse error');
 					socket.destroySoon();
 				}
 			} else {
-				// Do nothing yet.
+				// Do nothing.
 			}
 		}
 

data/lib/phusion_passenger.rb

@@ -30,7 +30,7 @@ module PhusionPassenger
 	
 	PACKAGE_NAME = 'passenger'
 	# Run 'rake ext/common/Constants.h' after changing this number.
-	VERSION_STRING = '4.0.19'
+	VERSION_STRING = '4.0.20'
 	
 	PREFERRED_NGINX_VERSION = '1.4.2'
 	NGINX_SHA256_CHECKSUM = '5361ffb7b0ebf8b1a04369bc3d1295eaed091680c1c58115f88d56c8e51f3611'

data/lib/phusion_passenger/{rails3_extensions → active_support3_extensions}/init.rb

@@ -26,17 +26,17 @@ require 'digest/md5'
 
 module PhusionPassenger
 
-module Rails3Extensions
+module ActiveSupport3Extensions
 	def self.init!(options, user_options = {})
 		if !AnalyticsLogging.install!(options, user_options)
 			# Remove code to save memory.
-			PhusionPassenger::Rails3Extensions.send(:remove_const, :AnalyticsLogging)
-			PhusionPassenger.send(:remove_const, :Rails3Extensions)
+			PhusionPassenger::ActiveSupport3Extensions.send(:remove_const, :AnalyticsLogging)
+			PhusionPassenger.send(:remove_const, :ActiveSupport3Extensions)
 		end
 	end
 end
 
-module Rails3Extensions
+module ActiveSupport3Extensions
 class AnalyticsLogging < ActiveSupport::LogSubscriber
 	def self.install!(options, user_options)
 		analytics_logger = options["analytics_logger"]
@@ -67,9 +67,11 @@ class AnalyticsLogging < ActiveSupport::LogSubscriber
 			exceptions_middleware = ActionDispatch::ShowExceptions
 		end
 		if exceptions_middleware
-			Rails.application.middleware.insert_after(
-				exceptions_middleware,
-				ExceptionLogger, analytics_logger, app_group_name)
+			if defined?(Rails)
+				Rails.application.middleware.insert_after(
+					exceptions_middleware,
+					ExceptionLogger, analytics_logger, app_group_name)
+			end
 		end
 		
 		if defined?(ActionController::Base)
@@ -231,6 +233,6 @@ class AnalyticsLogging < ActiveSupport::LogSubscriber
 		end
 	end
 end # class AnalyticsLogging
-end # module Rails3Extensions
+end # module ActiveSupport3Extensions
 
 end # module PhusionPassenger

data/lib/phusion_passenger/apache2/config_options.rb

@@ -100,5 +100,10 @@ APACHE2_DIRECTORY_CONFIGURATION_OPTIONS = [
 		:min_value => 0,
 		:context => ["OR_ALL"],
 		:desc => "The maximum number of queued requests."
+	},
+	{
+		:name => "PassengerLoadShellEnvvars",
+		:type => :flag,
+		:desc => "Whether to load environment variables from the shell before running the application."
 	}
 ]

data/lib/phusion_passenger/loader_shared_helpers.rb

@@ -187,17 +187,23 @@ module LoaderSharedHelpers
 		elsif File.exist?('config/setup_load_paths.rb')
 			require File.expand_path('config/setup_load_paths')
 		
-		# If the Bundler lock environment file exists then load that. If it
+		# Older versions of Bundler use .bundle/environment.rb as the Bundler
+		# environment lock file. This has been replaced by Gemfile.lock in later
+		# versions, but we still support the older mechanism.
+		# If the Bundler environment lock file exists then load that. If it
 		# exists then there's a 99.9% chance that loading it is the correct
 		# thing to do.
 		elsif File.exist?('.bundle/environment.rb')
-			require File.expand_path('.bundle/environment')
+			running_bundler do
+				require File.expand_path('.bundle/environment')
+			end
 		
-		# If the Bundler environment file doesn't exist then there are two
+		# If the legacy Bundler environment file doesn't exist then there are two
 		# possibilities:
 		# 1. Bundler is not used, in which case we don't have to do anything.
-		# 2. Bundler *is* used, but the gems are not locked and we're supposed
-		#    to call Bundler.setup.
+		# 2. Bundler *is* used, but either the user is using a newer Bundler versions,
+		#    or the gems are not locked. In either case, we're supposed to call
+		#    Bundler.setup.
 		#
 		# The existence of Gemfile indicates whether (2) is true:
 		elsif File.exist?('Gemfile')
@@ -208,8 +214,10 @@ module LoaderSharedHelpers
 			# harmless. If this isn't the correct thing to do after all then
 			# there's always the load_path_setup_file option and
 			# setup_load_paths.rb.
-			require 'rubygems'
-			require 'bundler/setup'
+			running_bundler do
+				require 'rubygems'
+				require 'bundler/setup'
+			end
 		end
 		
 		# Bundler might remove Phusion Passenger from the load path in its zealous
@@ -319,6 +327,52 @@ module LoaderSharedHelpers
 	def after_handling_requests
 		PhusionPassenger.call_event(:stopping_worker_process)
 	end
+
+private
+	def running_bundler
+		yield
+	rescue Exception => e
+		if defined?(Bundler::GemNotFound) && e.is_a?(Bundler::GemNotFound)
+			prepend_exception_comment(e, "It looks like Bundler could not find a gem. This " +
+				"is probably because your\n" +
+				"application is being run under a different environment than it's supposed to.\n" +
+				"Please check the following:\n\n" +
+				" * Is this app supposed to be run as the `#{whoami}` user?\n" +
+				" * Is this app being run on the correct Ruby interpreter? Below you will\n" +
+				"   see which Ruby interpreter Phusion Passenger attempted to use. If you \n" +
+				"   are using RVM, please also check whether the correct gemset is being used.\n")
+		end
+		raise e
+	end
+
+	def prepend_exception_comment(e, comment)
+		# Since Exception doesn't allow changing the message, we monkeypatch
+		# the #message and #to_s methods.
+		separator = "\n-------- The exception is as follows: -------\n"
+		new_message = comment + separator + e.message
+		new_s = comment + separator + e.to_s
+		metaclass = class << e; self; end
+		metaclass.send(:define_method, :message) do
+			new_message
+		end
+		metaclass.send(:define_method, :to_s) do
+			new_s
+		end
+	end
+
+	def whoami
+		require 'etc'
+		begin
+			user = Etc.getpwuid(Process.uid)
+		rescue ArgumentError
+			user = nil
+		end
+		if user
+			return user.name
+		else
+			return "##{Process.uid}"
+		end
+	end
 end
 
 end # module PhusionPassenger