passenger 4.0.27 → 4.0.28

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

@@ -51,6 +51,7 @@
 #include <Logging.h>
 #include <Exceptions.h>
 #include <StaticString.h>
+#include <Hooks.h>
 #include <ResourceLocator.h>
 #include <Utils.h>
 #include <Utils/Base64.h>
@@ -427,81 +428,16 @@ inferDefaultGroup(const string &defaultUser) {
 	return getGroupName(userEntry->pw_gid);
 }
 
-static vector< pair<string, string> >
-agentsOptionsToEnvVars(const VariantMap &agentsOptions) {
-	vector< pair<string, string> > result;
-	VariantMap::ConstIterator it, end = agentsOptions.end();
-
-	result.reserve(agentsOptions.size());
-	for (it = agentsOptions.begin(); it != end; it++) {
-		result.push_back(make_pair("passenger_" + it->first, it->second));
-	}
-
-	return result;
-}
-
 static void
-setEnvVarsFromVector(const vector< pair<string, string> > &envvars) {
-	vector< pair<string, string> >::const_iterator it;
-
-	for (it = envvars.begin(); it != envvars.end(); it++) {
-		setenv(it->first.c_str(), it->second.c_str(), 1);
-	}
-}
-
-static bool
-runHookScript(const char *name) {
+runHookScriptAndThrowOnError(const char *name) {
 	TRACE_POINT();
-	string value = agentsOptions.get(string("hook_") + name, false);
-	if (value.empty()) {
-		return true;
-	}
-
-	vector< pair<string, string> > envvars = agentsOptionsToEnvVars(agentsOptions);
-	pid_t pid;
-	int e, status;
-
-	P_INFO("Running " << name << " hook script: " << value);
-
-	pid = fork();
-	if (pid == 0) {
-		resetSignalHandlersAndMask();
-		disableMallocDebugging();
-		closeAllFileDescriptors(2);
-		setEnvVarsFromVector(envvars);
+	HookScriptOptions options;
 
-		execlp(value.c_str(), value.c_str(), (const char * const) 0);
-		e = errno;
-		fprintf(stderr, "*** ERROR: Cannot execute %s hook script %s: %s (errno=%d)\n",
-			name, value.c_str(), strerror(e), e);
-		fflush(stderr);
-		_exit(1);
-		return true; // Never reached.
+	options.name = name;
+	options.spec = agentsOptions.get(string("hook_") + name, false);
+	options.agentsOptions = &agentsOptions;
 
-	} else if (pid == -1) {
-		e = errno;
-		P_ERROR("Cannot fork a process for hook script " << value <<
-			": " << strerror(e) << " (errno=" << e << ")");
-		return false;
-
-	} else if (waitpid(pid, &status, 0) == -1) {
-		e = errno;
-		P_ERROR("Unable to wait for hook script " << value <<
-			" (PID " << pid << "): " << strerror(e) << " (errno=" <<
-			e << ")");
-		return false;
-
-	} else {
-		P_INFO("Hook script " << value << " (PID " << pid <<
-			") exited with status " << WEXITSTATUS(status));
-		return WEXITSTATUS(status) == 0;
-	}
-}
-
-static void
-runHookScriptAndThrowOnError(const char *name) {
-	TRACE_POINT();
-	if (!runHookScript(name)) {
+	if (!runHookScripts(options)) {
 		throw RuntimeException(string("Hook script ") + name + " failed");
 	}
 }
@@ -551,8 +487,8 @@ initializeOptions() {
 		.setDefault    ("default_ruby", DEFAULT_RUBY)
 		.setDefault    ("default_python", DEFAULT_PYTHON)
 		.setDefaultInt ("max_pool_size", DEFAULT_MAX_POOL_SIZE)
-		.setDefaultInt ("max_instances_per_app", DEFAULT_MAX_INSTANCES_PER_APP)
 		.setDefaultInt ("pool_idle_time", DEFAULT_POOL_IDLE_TIME);
+	agentsOptions.set  ("passenger_version", PASSENGER_VERSION);
 
 	// Check for required options
 	UPDATE_TRACE_POINT();

data/ext/nginx/CacheLocationConfig.c

@@ -90,6 +90,17 @@ u_char int_buf[32], *end, *buf, *pos;
 	
 
 	
+		if (conf->max_instances_per_app != NGX_CONF_UNSET) {
+			end = ngx_snprintf(int_buf,
+				sizeof(int_buf) - 1,
+				"%d",
+				conf->max_instances_per_app);
+			len += 24;
+			len += end - int_buf + 1;
+		}
+	
+
+	
 		if (conf->max_requests != NGX_CONF_UNSET) {
 			end = ngx_snprintf(int_buf,
 				sizeof(int_buf) - 1,
@@ -308,7 +319,7 @@ buf = pos = ngx_pnalloc(cf->pool, len);
 	
 		if (conf->min_instances != NGX_CONF_UNSET) {
 			pos = ngx_copy(pos,
-				"PASSENGER_MIN_INSTANCES",
+				"PASSENGER_MIN_PROCESSES",
 				24);
 			end = ngx_snprintf(int_buf,
 				sizeof(int_buf) - 1,
@@ -323,6 +334,23 @@ buf = pos = ngx_pnalloc(cf->pool, len);
 	
 
 	
+		if (conf->max_instances_per_app != NGX_CONF_UNSET) {
+			pos = ngx_copy(pos,
+				"PASSENGER_MAX_PROCESSES",
+				24);
+			end = ngx_snprintf(int_buf,
+				sizeof(int_buf) - 1,
+				"%d",
+				conf->max_instances_per_app);
+			pos = ngx_copy(pos,
+				int_buf,
+				end - int_buf);
+			*pos = '\0';
+			pos++;
+		}
+	
+
+	
 		if (conf->max_requests != NGX_CONF_UNSET) {
 			pos = ngx_copy(pos,
 				"PASSENGER_MAX_REQUESTS",

data/ext/nginx/Configuration.c

@@ -78,7 +78,6 @@ passenger_create_main_conf(ngx_conf_t *cf)
     conf->debug_log_file.len = 0;
     conf->abort_on_startup_error = NGX_CONF_UNSET;
     conf->max_pool_size = (ngx_uint_t) NGX_CONF_UNSET;
-    conf->max_instances_per_app = (ngx_uint_t) NGX_CONF_UNSET;
     conf->pool_idle_time = (ngx_uint_t) NGX_CONF_UNSET;
     conf->user_switching = NGX_CONF_UNSET;
     conf->default_user.data = NULL;
@@ -137,10 +136,6 @@ passenger_init_main_conf(ngx_conf_t *cf, void *conf_pointer)
         conf->max_pool_size = DEFAULT_MAX_POOL_SIZE;
     }
     
-    if (conf->max_instances_per_app == (ngx_uint_t) NGX_CONF_UNSET) {
-        conf->max_instances_per_app = DEFAULT_MAX_INSTANCES_PER_APP;
-    }
-    
     if (conf->pool_idle_time == (ngx_uint_t) NGX_CONF_UNSET) {
         conf->pool_idle_time = DEFAULT_POOL_IDLE_TIME;
     }
@@ -972,13 +967,6 @@ const ngx_command_t passenger_commands[] = {
       offsetof(passenger_main_conf_t, max_pool_size),
       NULL },
 
-    { ngx_string("passenger_max_instances_per_app"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, max_instances_per_app),
-      NULL },
-
     { ngx_string("passenger_pool_idle_time"),
       NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
       ngx_conf_set_num_slot,

data/ext/nginx/Configuration.h

@@ -57,7 +57,6 @@ typedef struct {
     ngx_str_t    temp_dir;
     ngx_flag_t   abort_on_startup_error;
     ngx_uint_t   max_pool_size;
-    ngx_uint_t   max_instances_per_app;
     ngx_uint_t   pool_idle_time;
     ngx_flag_t   user_switching;
     ngx_str_t    default_user;

data/ext/nginx/ConfigurationCommands.c

@@ -109,6 +109,16 @@
 	NULL
 },
 
+{
+	
+	ngx_string("passenger_max_instances_per_app"),
+	NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+	ngx_conf_set_num_slot,
+	NGX_HTTP_LOC_CONF_OFFSET,
+	offsetof(passenger_loc_conf_t, max_instances_per_app),
+	NULL
+},
+
 {
 	
 	ngx_string("passenger_max_requests"),

data/ext/nginx/ConfigurationFields.h

@@ -49,6 +49,8 @@
 
 	ngx_int_t load_shell_envvars;
 
+	ngx_int_t max_instances_per_app;
+
 	ngx_int_t max_preloader_idle_time;
 
 	ngx_int_t max_request_queue_size;

data/ext/nginx/CreateLocationConfig.c

@@ -72,6 +72,10 @@
 	
 
 	
+		conf->max_instances_per_app = NGX_CONF_UNSET;
+	
+
+	
 		conf->max_requests = NGX_CONF_UNSET;
 	
 

data/ext/nginx/MergeLocationConfig.c

@@ -82,6 +82,12 @@
 	
 
 	
+		ngx_conf_merge_value(conf->max_instances_per_app,
+			prev->max_instances_per_app,
+			NGX_CONF_UNSET);
+	
+
+	
 		ngx_conf_merge_value(conf->max_requests,
 			prev->max_requests,
 			NGX_CONF_UNSET);

data/ext/oxt/system_calls.cpp

@@ -718,7 +718,13 @@ syscalls::waitpid(pid_t pid, int *status, int options) {
  *************************************/
 
 #ifdef OXT_THREAD_LOCAL_KEYWORD_SUPPORTED
-	__thread bool this_thread::_syscalls_interruptable = true;
+	/* This variable is an int instead of a bool, because a bug in GCC 4.6
+	 * can cause segmentation faults for bool TLS variables.
+	 * https://code.google.com/p/phusion-passenger/issues/detail?id=902
+	 * 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;
 
 	bool
 	this_thread::syscalls_interruptable() {

data/ext/oxt/system_calls.hpp

@@ -188,7 +188,7 @@ namespace this_thread {
 	 * @intern
 	 */
 	#ifdef OXT_THREAD_LOCAL_KEYWORD_SUPPORTED
-		extern __thread bool _syscalls_interruptable;
+		extern __thread int _syscalls_interruptable;
 	#else
 		extern thread_specific_ptr<bool> _syscalls_interruptable;
 	#endif
@@ -211,8 +211,8 @@ namespace this_thread {
 	public:
 		enable_syscall_interruption() {
 			#ifdef OXT_THREAD_LOCAL_KEYWORD_SUPPORTED
-				last_value = _syscalls_interruptable;
-				_syscalls_interruptable = true;
+				last_value = !!_syscalls_interruptable;
+				_syscalls_interruptable = 1;
 			#else
 				if (_syscalls_interruptable.get() == NULL) {
 					last_value = true;
@@ -246,8 +246,8 @@ namespace this_thread {
 	public:
 		disable_syscall_interruption() {
 			#ifdef OXT_THREAD_LOCAL_KEYWORD_SUPPORTED
-				last_value = _syscalls_interruptable;
-				_syscalls_interruptable = false;
+				last_value = !!_syscalls_interruptable;
+				_syscalls_interruptable = 0;
 			#else
 				if (_syscalls_interruptable.get() == NULL) {
 					last_value = true;
@@ -274,11 +274,11 @@ namespace this_thread {
 	 */
 	class restore_syscall_interruption {
 	private:
-		int last_value;
+		bool last_value;
 	public:
 		restore_syscall_interruption(const disable_syscall_interruption &intr) {
 			#ifdef OXT_THREAD_LOCAL_KEYWORD_SUPPORTED
-				last_value = _syscalls_interruptable;
+				last_value = !!_syscalls_interruptable;
 				_syscalls_interruptable = intr.last_value;
 			#else
 				assert(_syscalls_interruptable.get() != NULL);

data/helper-scripts/node-loader.js

@@ -128,6 +128,9 @@ function installServer() {
 	if (!PhusionPassenger._appInstalled) {
 		PhusionPassenger._appInstalled = true;
 		PhusionPassenger._server = server;
+		server.address = function() {
+			return 'passenger';
+		}
 		finalizeStartup();
 
 		PhusionPassenger.on('request', function(headers, socket, bodyBegin) {
@@ -149,6 +152,7 @@ function installServer() {
 			server.once('listening', callback);
 		}
 		server.emit('listening');
+		return server;
 	} else {
 		throw new Error("http.Server.listen() was called more than once, which " +
 			"is not allowed because Phusion Passenger is in auto-install mode. " +
@@ -162,12 +166,12 @@ function installServer() {
 function listenAndMaybeInstall(port) {
 	if (port === 'passenger') {
 		if (!PhusionPassenger._appInstalled) {
-			installServer.apply(this, arguments);
+			return installServer.apply(this, arguments);
 		} else {
 			throw new Error("You may only call listen('passenger') once");
 		}
 	} else {
-		this.originalListen.apply(this, arguments);
+		return this.originalListen.apply(this, arguments);
 	}
 }
 

data/helper-scripts/rack-loader.rb

@@ -69,9 +69,12 @@ module App
 		LoaderSharedHelpers.run_load_path_setup_code(options)
 		LoaderSharedHelpers.before_loading_app_code_step2(options)
 		
-		require 'rubygems'
+		begin
+			require 'rubygems'
+		rescue LoadError
+		end
 		require 'rack'
-		rackup_file = ENV["RACKUP_FILE"] || options["rackup_file"] || "config.ru"
+		rackup_file = options["startup_file"] || "config.ru"
 		rackup_code = ::File.open(rackup_file, 'rb') do |f|
 			f.read
 		end

data/helper-scripts/rack-preloader.rb

@@ -96,9 +96,12 @@ module App
 		LoaderSharedHelpers.run_load_path_setup_code(options)
 		LoaderSharedHelpers.before_loading_app_code_step2(options)
 		
-		require 'rubygems'
+		begin
+			require 'rubygems'
+		rescue LoadError
+		end
 		require 'rack'
-		rackup_file = ENV["RACKUP_FILE"] || options["rackup_file"] || "config.ru"
+		rackup_file = options["startup_file"] || "config.ru"
 		rackup_code = ::File.open(rackup_file, 'rb') do |f|
 			f.read
 		end

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.27'
+	VERSION_STRING = '4.0.28'
 	
 	PREFERRED_NGINX_VERSION = '1.4.4'
 	NGINX_SHA256_CHECKSUM = '7c989a58e5408c9593da0bebcd0e4ffc3d892d1316ba5042ddb0be5b0b4102b9'

data/lib/phusion_passenger/apache2/config_options.rb

@@ -88,8 +88,16 @@ APACHE2_DIRECTORY_CONFIGURATION_OPTIONS = [
 		:type => :integer,
 		:context => ["OR_LIMIT", "ACCESS_CONF", "RSRC_CONF"],
 		:min_value => 0,
+		:header  => "PASSENGER_MIN_PROCESSES",
 		:desc => "The minimum number of application instances to keep when cleaning idle instances."
 	},
+	{
+		:name => "PassengerMaxInstancesPerApp",
+		:type => :integer,
+		:context => ["RSRC_CONF"],
+		:header  => "PASSENGER_MAX_PROCESSES",
+		:desc => "The maximum number of simultaneously alive application instances a single application may occupy."
+	},
 	{
 		:name => "PassengerUser",
 		:type => :string,

data/lib/phusion_passenger/constants.rb

@@ -41,7 +41,6 @@ module PhusionPassenger
 		DEFAULT_MAX_POOL_SIZE = 6
 		DEFAULT_POOL_IDLE_TIME = 300
 		DEFAULT_START_TIMEOUT = 90_000
-		DEFAULT_MAX_INSTANCES_PER_APP = 0
 		DEFAULT_WEB_APP_USER = "nobody"
 		DEFAULT_CONCURRENCY_MODEL = "process"
 		DEFAULT_THREAD_COUNT = 1

data/lib/phusion_passenger/nginx/config_options.rb

@@ -114,8 +114,15 @@ LOCATION_CONFIGURATION_OPTIONS = [
 		:type  => :flag
 	},
 	{
-		:name  => 'passenger_min_instances',
-		:type  => :integer
+		:name   => 'passenger_min_instances',
+		:type   => :integer,
+		:header => 'PASSENGER_MIN_PROCESSES'
+	},
+	{
+		:name     => 'passenger_max_instances_per_app',
+		:context  => [:main],
+		:type     => :integer,
+		:header   => 'PASSENGER_MAX_PROCESSES'
 	},
 	{
 		:name  => 'passenger_max_requests',

data/lib/phusion_passenger/platform_info/apache.rb

@@ -1,3 +1,4 @@
+# encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2013 Phusion
 #
@@ -184,7 +185,7 @@ module PlatformInfo
 
 	def self.httpd_actual_error_log(options = nil)
 		if config_file = httpd_default_config_file(options)
-			contents = File.read(config_file)
+			contents = File.open(config_file, "rb") { |f| f.read }
 			# We don't want to match comments
 			contents.gsub!(/^[ \t]*#.*/, '')
 			if contents =~ /^ErrorLog (.+)$/

data/lib/phusion_passenger/platform_info/compiler.rb

@@ -130,7 +130,7 @@ private
 				command = create_compiler_command(language,
 					"-c '#{filename}' -o '#{filename}.o'",
 					'-feliminate-unused-debug-symbols -feliminate-unused-debug-types')
-				result = run_compiler("Checking for #{compiler_type_name} compiler '--feliminate-unused-debug-{symbols,types}' support",
+				result = run_compiler("Checking for #{compiler_type_name} compiler '-feliminate-unused-debug-{symbols,types}' support",
 					command, filename, '', true)
 				return result && result[:output].empty?
 			ensure
@@ -427,6 +427,20 @@ public
 	end
 	memoize :adress_sanitizer_flag
 
+	def self.cxx_11_flag
+		source = %Q{
+			#include <unordered_map>
+		}
+		if try_compile("Checking for C++ -std=gnu++11 compiler flag", :cxx, source, '-std=gnu++11')
+			return "-std=gnu++11"
+		elsif try_compile("Checking for C++ -std=c++11 compiler flag", :cxx, source, '-std=c++')
+			return "-std=c++11"
+		else
+			return nil
+		end
+	end
+	memoize :cxx_11_flag, true
+
 	def self.has_rt_library?
 		return try_link("Checking for -lrt support",
 			:c, "int main() { return 0; }\n", '-lrt')