passenger 4.0.5 → 4.0.6

data/ext/nginx/config

@@ -1,6 +1,10 @@
 PATH="$ngx_addon_dir/../../bin:$PATH"
 export PATH
 
+if ! ruby -v >/dev/null 2>/dev/null; then
+    echo '*** ERROR: Cannot find the "ruby" command in $PATH. Please fix your $PATH. You can learn more about $PATH at: http://www.modrails.com/documentation/Users%20guide%20Apache.html#_the_path_environment_variable'
+fi
+
 if test "x$PASSENGER_LIBS" = "x" && ! passenger-config --compiled; then
     echo "*** The Phusion Passenger support files are not yet compiled. Compiling them for you... ***"
     echo "*** Running 'rake nginx CACHING=false' in $ngx_addon_dir... ***"

data/ext/nginx/ngx_http_passenger_module.c

@@ -288,6 +288,7 @@ start_helper_server(ngx_cycle_t *cycle) {
     pp_variant_map_set_ngx_str(params, "analytics_log_user", &passenger_main_conf.analytics_log_user);
     pp_variant_map_set_ngx_str(params, "analytics_log_group", &passenger_main_conf.analytics_log_group);
     pp_variant_map_set_ngx_str(params, "union_station_gateway_address", &passenger_main_conf.union_station_gateway_address);
+    pp_variant_map_set_int    (params, "union_station_gateway_port", passenger_main_conf.union_station_gateway_port);
     pp_variant_map_set_ngx_str(params, "union_station_gateway_cert", &passenger_main_conf.union_station_gateway_cert);
     pp_variant_map_set_ngx_str(params, "union_station_proxy_address", &passenger_main_conf.union_station_proxy_address);
     pp_variant_map_set_strset (params, "prestart_urls", (const char **) prestart_uris_ary, passenger_main_conf.prestart_uris->nelts);

data/ext/oxt/implementation.cpp

@@ -298,7 +298,7 @@ thread::make_thread_name(const string &given_name) {
 			stringstream str;
 			str << "Thread #";
 			{
-				lock_guard<boost::mutex> l(global_context->thread_registration_mutex);
+				boost::lock_guard<boost::mutex> l(global_context->thread_registration_mutex);
 				str << global_context->next_thread_number;
 			}
 			return str.str();
@@ -315,7 +315,7 @@ thread::thread_main(const boost::function<void ()> func, thread_local_context_pt
 	set_thread_local_context(ctx);
 
 	if (OXT_LIKELY(global_context != NULL)) {
-		lock_guard<boost::mutex> l(global_context->thread_registration_mutex);
+		boost::lock_guard<boost::mutex> l(global_context->thread_registration_mutex);
 
 		ctx->thread = pthread_self();
 		global_context->next_thread_number++;
@@ -335,7 +335,7 @@ thread::thread_main(const boost::function<void ()> func, thread_local_context_pt
 	// We don't care about other exceptions because they'll crash the process anyway.
 
 	if (OXT_LIKELY(global_context != NULL)) {
-		lock_guard<boost::mutex> l(global_context->thread_registration_mutex);
+		boost::lock_guard<boost::mutex> l(global_context->thread_registration_mutex);
 		thread_local_context *ctx = get_thread_local_context();
 		if (ctx != 0 && ctx->thread_number != 0) {
 			global_context->registered_threads.erase(ctx->iterator);
@@ -364,7 +364,7 @@ string
 thread::all_backtraces() throw() {
 	#ifdef OXT_BACKTRACE_IS_ENABLED
 		if (OXT_LIKELY(global_context != NULL)) {
-			lock_guard<boost::mutex> l(global_context->thread_registration_mutex);
+			boost::lock_guard<boost::mutex> l(global_context->thread_registration_mutex);
 			list<thread_local_context_ptr>::const_iterator it;
 			std::stringstream result;
 			

data/lib/phusion_passenger.rb

@@ -29,7 +29,8 @@ module PhusionPassenger
 	###### Version numbers ######
 	
 	PACKAGE_NAME = 'passenger'
-	VERSION_STRING = '4.0.5'
+	# Run 'rake ext/common/Constants.h' after changing this number.
+	VERSION_STRING = '4.0.6'
 	
 	PREFERRED_NGINX_VERSION = '1.4.1'
 	NGINX_SHA256_CHECKSUM = 'bca5d1e89751ba29406185e1736c390412603a7e6b604f5b4575281f6565d119'
@@ -42,7 +43,7 @@ module PhusionPassenger
 	
 	###### Directories ######
 	
-	GLOBAL_NAMESPACE_DIRNAME            = "phusion-passenger"
+	GLOBAL_NAMESPACE_DIRNAME            = "passenger"
 	GLOBAL_STANDALONE_NAMESPACE_DIRNAME = "passenger-standalone"
 	# Subdirectory under $HOME to use for storing stuff.
 	USER_NAMESPACE_DIRNAME              = ".passenger"
@@ -97,13 +98,13 @@ module PhusionPassenger
 			@source_root           = File.dirname(File.dirname(FILE_LOCATION))
 			@natively_packaged     = false
 			@bin_dir               = "#{@source_root}/bin".freeze
-			@agents_dir            = "#{@source_root}/agents".freeze
-			@lib_dir               = "#{@source_root}/libout".freeze
+			@agents_dir            = "#{@source_root}/buildout/agents".freeze
+			@lib_dir               = "#{@source_root}/buildout".freeze
 			@helper_scripts_dir    = "#{@source_root}/helper-scripts".freeze
 			@resources_dir         = "#{@source_root}/resources".freeze
 			@include_dir           = "#{@source_root}/ext".freeze
 			@doc_dir               = "#{@source_root}/doc".freeze
-			@apache2_module_path   = "#{@source_root}/libout/apache2/mod_passenger.so".freeze
+			@apache2_module_path   = "#{@source_root}/buildout/apache2/mod_passenger.so".freeze
 			@ruby_extension_source_dir = "#{@source_root}/ext/ruby"
 		end
 	end
@@ -163,6 +164,14 @@ module PhusionPassenger
 	def self.ruby_extension_source_dir
 		return @ruby_extension_source_dir
 	end
+
+	def self.nginx_addon_dir
+		if PhusionPassenger.natively_packaged?
+			return "#{resources_dir}/ngx_http_passenger_module"
+		else
+			return "#{source_root}/ext/nginx"
+		end
+	end
 	
 	
 	###### Other resource locations ######

data/lib/phusion_passenger/abstract_installer.rb

@@ -25,6 +25,7 @@ require 'phusion_passenger'
 require 'phusion_passenger/constants'
 require 'phusion_passenger/console_text_template'
 require 'phusion_passenger/platform_info'
+require 'phusion_passenger/platform_info/operating_system'
 require 'phusion_passenger/utils/ansi_colors'
 
 # IMPORTANT: do not directly or indirectly require native_support; we can't compile
@@ -156,6 +157,42 @@ protected
 			return false
 		end
 	end
+
+	def check_whether_os_is_broken
+		if PlatformInfo.os_name == "freebsd9" && `uname -r` =~ /^9\.1-/
+			new_screen
+			render_template 'installer_common/freebsd9_broken_cxx_runtime'
+			wait
+		end
+	end
+
+	def check_whether_system_has_enough_ram(required = 1024)
+		begin
+			meminfo = File.read("/proc/meminfo")
+			if meminfo =~ /^MemTotal: *(\d+) kB$/
+				ram_mb = $1.to_i / 1024
+				if meminfo =~ /^SwapTotal: *(\d+) kB$/
+					swap_mb = $1.to_i / 1024
+				else
+					swap_mb = 0
+				end
+			end
+		rescue Errno::ENOENT, Errno::EACCES
+			# Don't do anything on systems without memory information.
+			ram_mb = nil
+			swap_mb = nil
+		end
+		if ram_mb && swap_mb && ram_mb + swap_mb < required
+			new_screen
+			render_template 'installer_common/low_amount_of_memory_warning',
+				:required => required,
+				:current => ram_mb + swap_mb,
+				:ram => ram_mb,
+				:swap => swap_mb,
+				:doc => users_guide
+			wait
+		end
+	end
 	
 	
 	def use_stderr
@@ -229,6 +266,8 @@ protected
 			end
 		end
 		return result
+	rescue Interrupt
+		raise Abort
 	end
 	
 	def prompt_confirmation(message)
@@ -241,6 +280,8 @@ protected
 			end
 		end
 		return result.downcase == 'y'
+	rescue Interrupt
+		raise Abort
 	end
 
 	def wait(timeout = nil)

data/lib/phusion_passenger/admin_tools/server_instance.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2013 Phusion
 #
@@ -188,34 +189,30 @@ class ServerInstance
 	# - +RoleDeniedError+: The user that the current process is as is not authorized to utilize the given role.
 	# - +EOFError+: The server unexpectedly closed the connection during authentication.
 	# - +SecurityError+: The server denied our authentication credentials.
-	def connect(role_or_username, password = nil)
-		if role_or_username.is_a?(Symbol)
-			case role_or_username
-			when :passenger_status
-				username = "_passenger-status"
-				begin
-					filename = "#{@generation_path}/passenger-status-password.txt"
-					password = File.open(filename, "rb") do |f|
-						f.read
-					end
-				rescue Errno::EACCES
-					raise RoleDeniedError
-				end
-			else
-				raise ArgumentError, "Unsupported role #{role_or_username}"
-			end
+	def connect(options)
+		if options[:role]
+			username, password, default_socket_name = infer_connection_info_from_role(options[:role])
+			socket_name = options[:socket_name] || default_socket_name
 		else
-			username = role_or_username
+			username = options[:username]
+			password = options[:password]
+			socket_name = options[:socket_name] || "helper_admin"
+			raise ArgumentError, "Either the :role or :username must be set" if !username
+			raise ArgumentError, ":password must be set" if !password
 		end
 		
-		@client = MessageClient.new(username, password, "unix:#{@generation_path}/helper_admin")
-		begin
-			yield self
-		ensure
-			@client.close
+		client = MessageClient.new(username, password, "unix:#{@generation_path}/#{socket_name}")
+		if block_given?
+			begin
+				yield client
+			ensure
+				client.close
+			end
+		else
+			return client
 		end
 	end
-	
+
 	def web_server_description
 		return File.read("#{@generation_path}/web_server.txt")
 	end
@@ -241,18 +238,7 @@ class ServerInstance
 		return nil
 	end
 	
-	def status(*options)
-		return @client.status(*options)
-	end
-	
-	def backtraces
-		return @client.backtraces
-	end
-	
-	def xml
-		return @client.xml
-	end
-	
+	# FIXME: probably broken
 	def stats
 		doc = REXML::Document.new(xml)
 		stats = Stats.new
@@ -262,12 +248,14 @@ class ServerInstance
 		return stats
 	end
 	
+	# FIXME: probably broken
 	def get_wait_list_size
 		return stats.get_wait_list_size
 	end
 	
-	def groups
-		doc = REXML::Document.new(xml)
+	# FIXME: probably broken
+	def groups(client)
+		doc = REXML::Document.new(client.pool_xml)
 		
 		groups = []
 		doc.elements.each("info/supergroups/supergroup/group") do |group_xml|
@@ -309,8 +297,9 @@ class ServerInstance
 		return groups
 	end
 	
-	def processes
-		return groups.map do |group|
+	# FIXME: probably broken
+	def processes(client)
+		return groups(client).map do |group|
 			group.processes
 		end.flatten
 	end
@@ -323,6 +312,26 @@ private
 	def self.current_time
 		Time.now
 	end
+
+	def infer_connection_info_from_role(role)
+		case role
+		when :passenger_status
+			username = "_passenger-status"
+			begin
+				filename = "#{@generation_path}/passenger-status-password.txt"
+				password = File.open(filename, "rb") do |f|
+					f.read
+				end
+			rescue Errno::EACCES
+				raise RoleDeniedError
+			rescue Errno::ENOENT
+				raise CorruptedDirectoryError
+			end
+			return [username, password, "helper_admin"]
+		else
+			raise ArgumentError, "Unsupported role #{role}"
+		end
+	end
 	
 	class << self;
 		private :log_cleaning_action

data/lib/phusion_passenger/message_client.rb

@@ -74,10 +74,21 @@ class MessageClient
 		return !!@channel
 	end
 	
-	### ApplicationPool::Server methods ###
+	### HelperAgent methods ###
 	
-	def detach(detach_key)
-		write("detach", detach_key)
+	def pool_detach_process(pid)
+		write("detach_process", pid)
+		check_security_response
+		result = read
+		if result.nil?
+			raise EOFError
+		else
+			return result.first == "true"
+		end
+	end
+
+	def pool_detach_process_by_key(detach_key)
+		write("detach_process_by_key", detach_key)
 		check_security_response
 		result = read
 		if result.nil?
@@ -87,7 +98,7 @@ class MessageClient
 		end
 	end
 	
-	def status(options = {})
+	def pool_status(options = {})
 		write("inspect", *options.to_a.flatten)
 		check_security_response
 		return read_scalar
@@ -96,19 +107,32 @@ class MessageClient
 		raise
 	end
 	
-	def xml
+	def pool_xml
 		write("toXml", true)
 		check_security_response
 		return read_scalar
 	end
 	
-	### BacktracesServer methods ###
+	def helper_agent_requests
+		write("requests")
+		check_security_response
+		return read_scalar
+	end
+
+	### HelperAgent BacktracesServer methods ###
 	
-	def backtraces
+	def helper_agent_backtraces
 		write("backtraces")
 		check_security_response
 		return read_scalar
 	end
+
+	### LoggingAgent AdminServer methods ###
+	
+	def logging_agent_status
+		write("status")
+		return read_scalar
+	end
 	
 	### Low level I/O methods ###
 	

data/lib/phusion_passenger/native_support.rb

@@ -70,13 +70,15 @@ private
 	def native_support_dir_in_source_root
 		if PhusionPassenger.originally_packaged?
 			@native_support_dir_in_source_root ||=
-				File.expand_path("#{PhusionPassenger.source_root}/libout/ruby")
+				File.expand_path("#{PhusionPassenger.source_root}/buildout/ruby")
 		else
 			return nil
 		end
 	end
 
 	def load_from_native_support_output_dir
+		# Quick workaround for people suffering from
+		# https://code.google.com/p/phusion-passenger/issues/detail?id=865
 		output_dir = ENV['PASSENGER_NATIVE_SUPPORT_OUTPUT_DIR']
 		if output_dir && !output_dir.empty?
 			begin
@@ -136,7 +138,11 @@ private
 		target_dirs << "#{home}/#{USER_NAMESPACE_DIRNAME}/native_support/#{VERSION_STRING}/#{archdir}"
 		
 		target_dir = compile(target_dirs)
-		require "#{target_dir}/#{library_name}"
+		if target_dir
+			require "#{target_dir}/#{library_name}"
+		else
+			STDERR.puts "Ruby native_support extension not loaded. Continuing without native_support."
+		end
 	end
 	
 	def mkdir(dir)
@@ -148,12 +154,16 @@ private
 	end
 	
 	def sh(*args)
-		command_string = args.join(' ')
-		STDERR.puts "# #{command_string}"
-		if !system(*args)
+		if !sh_nonfatal(*args)
 			raise "Could not compile #{library_name} (\"#{command_string}\" failed)"
 		end
 	end
+
+	def sh_nonfatal(*args)
+		command_string = args.join(' ')
+		STDERR.puts "# #{command_string}"
+		return system(*args)
+	end
 	
 	def compile(target_dirs)
 		result = nil
@@ -164,18 +174,29 @@ private
 				File.unlink("#{target_dir}/.permission_test")
 				STDERR.puts "# cd #{target_dir}"
 				Dir.chdir(target_dir) do
-					sh("#{PlatformInfo.ruby_command} '#{extconf_rb}'")
-					sh("make")
+					result =
+						sh_nonfatal("#{PlatformInfo.ruby_command} '#{extconf_rb}'") &&
+						sh_nonfatal("make")
+					if result
+						STDERR.puts "Compilation succesful."
+						STDERR.puts "-------------------------------"
+						return target_dir
+					else
+						STDERR.puts "Compilation failed."
+						STDERR.puts "-------------------------------"
+						return nil
+					end
 				end
-				result = target_dir
-				break
 			rescue Errno::EACCES
 				# If we encountered a permission error, then try
 				# the next target directory. If we get a permission
 				# error on the last one too then propagate the
 				# exception.
 				if i == target_dirs.size - 1
-					raise
+					STDERR.puts "Encountered permission error, " +
+						"but no more directories to try. Giving up."
+					STDERR.puts "-------------------------------"
+					return nil
 				else
 					STDERR.puts "Encountered permission error, " +
 						"trying a different directory..."
@@ -188,14 +209,16 @@ private
 				# in Phusion Passenger Standalone. In this case
 				# just ignore this directory.
 				if i == target_dirs.size - 1
-					raise
+					STDERR.puts "Encountered permission error, " +
+						"but no more directories to try. Giving up."
+					STDERR.puts "-------------------------------"
+					return nil
 				else
 					STDERR.puts "Not a valid directory. Trying a different one..."
 					STDERR.puts "-------------------------------"
 				end
 			end
 		end
-		return result
 	end
 end