passenger 4.0.0.rc6 → 4.0.1

data/lib/phusion_passenger.rb

@@ -31,9 +31,9 @@ module PhusionPassenger
 	PACKAGE_NAME = 'passenger'
 	
 	# Phusion Passenger version number. Don't forget to edit ext/common/Constants.h too.
-	VERSION_STRING = '4.0.0.rc6'
+	VERSION_STRING = '4.0.1'
 	
-	PREFERRED_NGINX_VERSION = '1.2.7'
+	PREFERRED_NGINX_VERSION = '1.4.0'
 	PREFERRED_PCRE_VERSION  = '8.32'
 	STANDALONE_INTERFACE_VERSION  = 1
 	

data/lib/phusion_passenger/loader_shared_helpers.rb

@@ -81,12 +81,12 @@ module LoaderSharedHelpers
 				f.puts "RUBY_PLATFORM = #{RUBY_PLATFORM}"
 				f.puts "RUBY_ENGINE = #{defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'nil'}"
 			end
-			File.open("#{dir}/load_path", "w") do |f|
+			File.open("#{dir}/load_path", "wb") do |f|
 				$LOAD_PATH.each do |path|
 					f.puts path
 				end
 			end
-			File.open("#{dir}/loaded_libs", "w") do |f|
+			File.open("#{dir}/loaded_libs", "wb") do |f|
 				$LOADED_FEATURES.each do |filename|
 					f.puts filename
 				end
@@ -94,7 +94,7 @@ module LoaderSharedHelpers
 
 			# We write to these files last because the 'require' calls can fail.
 			require 'rbconfig' if !defined?(RbConfig::CONFIG)
-			File.open("#{dir}/rbconfig", "w") do |f|
+			File.open("#{dir}/rbconfig", "wb") do |f|
 				RbConfig::CONFIG.each_pair do |key, value|
 					f.puts "#{key} = #{value}"
 				end
@@ -103,7 +103,7 @@ module LoaderSharedHelpers
 			File.open("#{dir}/ruby_info", "a") do |f|
 				f.puts "RubyGems version = #{Gem::VERSION}"
 			end
-			File.open("#{dir}/activated_gems", "w") do |f|
+			File.open("#{dir}/activated_gems", "wb") do |f|
 				if Gem.respond_to?(:loaded_specs)
 					Gem.loaded_specs.each_pair do |name, spec|
 						f.puts "#{name} => #{spec.version}"
@@ -119,7 +119,7 @@ module LoaderSharedHelpers
 
 	def dump_envvars
 		if dir = ENV['PASSENGER_DEBUG_DIR']
-			File.open("#{dir}/envvars", "w") do |f|
+			File.open("#{dir}/envvars", "wb") do |f|
 				ENV.each_pair do |key, value|
 					f.puts "#{key} = #{value}"
 				end
@@ -131,7 +131,7 @@ module LoaderSharedHelpers
 
 	def dump_system_memory_stats
 		if dir = ENV['PASSENGER_DEBUG_DIR']
-			File.open("#{dir}/sysmemory", "w") do |f|
+			File.open("#{dir}/sysmemory", "wb") do |f|
 				f.write(`"#{PhusionPassenger.helper_scripts_dir}/system-memory-stats.py"`)
 			end
 		end

data/lib/phusion_passenger/platform_info/compiler.rb

@@ -257,6 +257,22 @@ public
 			:c, '', '-Wno-ambiguous-member-template')
 	end
 	memoize :compiler_supports_wno_ambiguous_member_template?, true
+
+	def self.compiler_supports_feliminate_unused_debug?
+		create_temp_file("passenger-compile-check.c") do |filename, f|
+			f.close
+			begin
+				command = create_compiler_command(:c,
+					"-c '#{filename}' -o '#{filename}.o'",
+					'-feliminate-unused-debug-symbols -feliminate-unused-debug-types')
+				result = run_compiler("Checking for C compiler '--feliminate-unused-debug-{symbols,types}' support",
+					command, filename, '', true)
+				return result && result[:output].empty?
+			ensure
+				File.unlink("#{filename}.o") rescue nil
+			end
+		end
+	end
 	
 	# Returns whether compiling C++ with -fvisibility=hidden might result
 	# in tons of useless warnings, like this:

data/lib/phusion_passenger/platform_info/depcheck_specs/apache2.rb

@@ -44,7 +44,7 @@ define 'apache2-dev' do
 	end
 
 	on :debian do
-		apt_get_install "apache2-worker-dev"
+		apt_get_install "apache2-threaded-dev"
 	end
 	on :mandriva do
 		urpmi "apache-devel"

data/lib/phusion_passenger/request_handler.rb

@@ -213,6 +213,7 @@ class RequestHandler
 			end
 			
 			install_useful_signal_handlers
+			RobustInterruption.install
 			start_threads
 			wait_until_termination
 			terminate_threads

data/lib/phusion_passenger/standalone/start_command.rb

@@ -109,10 +109,6 @@ private
 		require 'fileutils' unless defined?(FileUtils)
 	end
 	
-	def require_app_finder
-		require 'phusion_passenger/standalone/app_finder' unless defined?(AppFinder)
-	end
-	
 	def parse_my_options
 		description = "Starts Phusion Passenger Standalone and serve one or more Ruby web applications."
 		parse_options!("start [directory]", description) do |opts|

data/lib/phusion_passenger/utils/robust_interruption.rb

@@ -5,6 +5,26 @@ module Utils
 
 module RobustInterruption
 	class Interrupted < StandardError
+		def initialize
+			@origin_thread = Thread.current
+			@origin = caller
+		end
+
+		def set_backtrace(bt)
+			@origin.reverse.each do |line|
+				if bt.last == line
+					bt.pop
+				else
+					break
+				end
+			end
+			bt << "interruption initiator thread: #{RobustInterruption._get_thread_display_name @origin_thread}"
+			bt.concat(@origin)
+			super(bt)
+		end
+	end
+
+	class NotInstalled < StandardError
 	end
 
 	class Data
@@ -52,43 +72,29 @@ module RobustInterruption
 		RobustInterruption.install
 	end
 
-	def installed?(thread = Thread.current)
-		return !!thread[:robust_interruption]
-	end
-	module_function :installed?
-
 	def interrupted?(thread = Thread.current)
 		if data = thread[:robust_interruption]
 			return data.interrupted?
 		else
-			Kernel.raise "RobustThreadInterruption not installed for #{thread}"
+			Kernel.raise NotInstalled, "RobustThreadInterruption not installed for #{_get_thread_display_name thread}"
 		end
 	end
 	module_function :interrupted?
 
 	def self.raise(thread, exception = Interrupted)
-		if installed?
+		if data = thread[:robust_interruption]
 			RobustInterruption.disable_interruptions(Thread.current) do
-				_raise(thread, exception)
-			end
-		else
-			_raise(thread, exception)
-		end
-	end
-
-	def self._raise(thread, exception)
-		data = thread[:robust_interruption]
-		if data
-			data.interrupted = true
-			if data.try_lock
-				begin
-					thread.raise(exception)
-				ensure
-					data.unlock
+				data.interrupted = true
+				if data.try_lock
+					begin
+						thread.raise(exception)
+					ensure
+						data.unlock
+					end
 				end
 			end
 		else
-			Kernel.raise "RobustThreadInterruption not installed for #{thread}"
+			Kernel.raise NotInstalled, "RobustThreadInterruption not installed for #{_get_thread_display_name thread}"
 		end
 	end
 
@@ -105,7 +111,7 @@ module RobustInterruption
 				data.unlock if was_interruptable
 			end
 		else
-			Kernel.raise "RobustThreadInterruption not installed for #{thread}"
+			Kernel.raise NotInstalled, "RobustThreadInterruption not installed for #{_get_thread_display_name thread}"
 		end
 	end
 	module_function :disable_interruptions
@@ -123,7 +129,7 @@ module RobustInterruption
 				data.pop_interruption_flag
 			end
 		else
-			Kernel.raise "RobustThreadInterruption not installed for #{thread}"
+			Kernel.raise NotInstalled, "RobustThreadInterruption not installed for #{_get_thread_display_name thread}"
 		end
 	end
 	module_function :enable_interruptions
@@ -132,7 +138,7 @@ module RobustInterruption
 		data = thread[:robust_interruption]
 		if data
 			if data.interruption_flags.size < 2
-				Kernel.raise "Cannot restore interruptions state to previous value - no previous value exists"
+				Kernel.raise NotInstalled, "Cannot restore interruptions state to previous value - no previous value exists"
 			end
 			if data.interruption_flags[-2]
 				enable_interruptions do
@@ -144,10 +150,23 @@ module RobustInterruption
 				end
 			end
 		else
-			Kernel.raise "RobustThreadInterruption not installed for #{thread}"
+			Kernel.raise NotInstalled, "RobustThreadInterruption not installed for #{_get_thread_display_name thread}"
 		end
 	end
 	module_function :restore_interruptions
+
+private
+	def _get_thread_display_name(thread)
+		if !(thread_id = thread[:id])
+			thread.to_s =~ /:(0x[0-9a-f]+)/i
+			thread_id = $1 || '?'
+		end
+		if thread_name = thread[:name]
+			thread_name = "(#{thread_name})"
+		end
+		return "#{thread_id}#{thread_name}"
+	end
+	module_function :_get_thread_display_name
 end
 
 end # module Utils

data/resources/templates/standalone/config.erb

@@ -1,26 +1,7 @@
 #####################################################
-#
-#       !!!!!!! WARNING, READ THIS !!!!!!!
-#
-#
-#  The fact that Phusion Passenger uses Nginx
-#  internally is considered to be an implementation
-#  detail that the user should not bother with.
-#  We may arbitrarily replace the Nginx core with
-#  something else in the future.
-#
-#  As such, we do not support any kind of custom
-#  Nginx configuration in Phusion Passenger Standalone.
-#  If you need additional Nginx modules or if you need
-#  special Nginx configuration or whatever then you
-#  should use Phusion Passenger for Nginx, NOT
-#  Phusion Passenger Standalone.
-#
-#  You are strongly discouraged from editing this file
-#  and treating Phusion Passenger Standalone as an easy
-#  way to start Nginx. We will not provide any support
-#  for this.
-# 
+#  This file is autogenerated by Phusion Passenger Standalone
+#  from <%= template_filename %>
+#  Please edit that file instead.
 #####################################################
 
 
@@ -96,6 +77,7 @@ http {
             union_station_key <%= app[:union_station_key] %>;
         <% end %>
 
+        # Rails asset pipeline support.
         location ~ ^/assets/ {
             error_page 490 = @static_asset;
             error_page 491 = @dynamic_request;

data/test/config.json.example

@@ -38,5 +38,5 @@
   // If you want to run the Nginx integration tests, then set the following
   // config option to the full path of the Nginx binary. This Nginx binary *must*
   // be compiled with Phusion Passenger support!
-  // nginx: /usr/local/sbin/nginx
+  "nginx": "/usr/local/sbin/nginx"
 }

data/test/cxx/ApplicationPool2/DirectSpawnerTest.cpp

@@ -27,7 +27,6 @@ namespace tut {
 		~ApplicationPool2_DirectSpawnerTest() {
 			setLogLevel(DEFAULT_LOG_LEVEL);
 			unlink("stub/wsgi/passenger_wsgi.pyc");
-			Process::maybeShutdown(process);
 			PipeWatcher::onData = PipeWatcher::DataCallback();
 		}
 		
@@ -67,7 +66,8 @@ namespace tut {
 		spawner.getConfig()->forwardStderr = false;
 		
 		try {
-			spawner.spawn(options);
+			process = spawner.spawn(options);
+			process->requiresShutdown = false;
 			fail("Timeout expected");
 		} catch (const SpawnException &e) {
 			ensure_equals(e.getErrorKind(),
@@ -89,7 +89,8 @@ namespace tut {
 		spawner.getConfig()->forwardStderr = false;
 		
 		try {
-			spawner.spawn(options);
+			process = spawner.spawn(options);
+			process->requiresShutdown = false;
 			fail("SpawnException expected");
 		} catch (const SpawnException &e) {
 			ensure_equals(e.getErrorKind(),
@@ -108,6 +109,7 @@ namespace tut {
 		options.startupFile  = "start.rb";
 		SpawnerPtr spawner = createSpawner(options);
 		process = spawner->spawn(options);
+		process->requiresShutdown = false;
 		ensure_equals(process->sockets->size(), 1u);
 		
 		Connection conn = process->sockets->front().checkoutConnection();

data/test/cxx/ApplicationPool2/PoolTest.cpp

@@ -732,7 +732,7 @@ namespace tut {
 		SessionPtr session3 = pool->get(options, &ticket);
 		{
 			LockGuard l(pool->syncher);
-			ensure("(4)", !session1->getProcess()->isAlive());
+			ensure("(4)", session1->getProcess()->enabled == Process::DETACHED);
 			ensure_equals("(6)", fooGroup->getWaitlist.size(), 1u);
 			ensure_equals("(7)", pool->getWaitlist.size(), 0u);
 		}
@@ -763,10 +763,17 @@ namespace tut {
 
 		ProcessPtr process = currentSession->getProcess();
 		pool->detachProcess(currentSession->getProcess());
-		ensure(!process->isAlive());
+		{
+			LockGuard l(pool->syncher);
+			ensure(process->enabled == Process::DETACHED);
+		}
 		EVENTUALLY(5,
 			result = pool->getProcessCount() == 2;
 		);
+		currentSession.reset();
+		EVENTUALLY(5,
+			result = process->isDead();
+		);
 	}
 	
 	TEST_METHOD(31) {
@@ -866,6 +873,72 @@ namespace tut {
 		ensure(!superGroup->garbageCollectable());
 	}
 
+	TEST_METHOD(34) {
+		// When detaching a process, it waits until all sessions have
+		// finished before telling the process to shut down.
+		Options options = createOptions();
+		options.spawnMethod = "direct";
+		options.minProcesses = 0;
+		SessionPtr session = pool->get(options, &ticket);
+		ProcessPtr process = session->getProcess();
+
+		ensure(pool->detachProcess(process));
+		{
+			LockGuard l(pool->syncher);
+			ensure_equals(process->enabled, Process::DETACHED);
+		}
+		SHOULD_NEVER_HAPPEN(100,
+			LockGuard l(pool->syncher);
+			result = !process->isAlive()
+				|| !process->osProcessExists();
+		);
+
+		session.reset();
+		EVENTUALLY(1,
+			LockGuard l(pool->syncher);
+			result = process->enabled == Process::DETACHED
+				&& !process->osProcessExists()
+				&& process->isDead();
+		);
+	}
+
+	TEST_METHOD(35) {
+		// When detaching a process, it waits until the OS processes
+		// have exited before cleaning up the in-memory data structures.
+		Options options = createOptions();
+		options.spawnMethod = "direct";
+		options.minProcesses = 0;
+		ProcessPtr process = pool->get(options, &ticket)->getProcess();
+
+		ScopeGuard g(boost::bind(::kill, process->pid, SIGCONT));
+		kill(process->pid, SIGSTOP);
+
+		ensure(pool->detachProcess(process));
+		{
+			LockGuard l(pool->syncher);
+			ensure_equals(process->enabled, Process::DETACHED);
+		}
+		EVENTUALLY(1,
+			result = process->getLifeStatus() == Process::SHUTDOWN_TRIGGERED;
+		);
+
+		SHOULD_NEVER_HAPPEN(100,
+			LockGuard l(pool->syncher);
+			result = process->isDead()
+				|| !process->osProcessExists();
+		);
+
+		kill(process->pid, SIGCONT);
+		g.clear();
+
+		EVENTUALLY(1,
+			LockGuard l(pool->syncher);
+			result = process->enabled == Process::DETACHED
+				&& !process->osProcessExists()
+				&& process->isDead();
+		);
+	}
+
 	
 	/*********** Test disabling and enabling processes ***********/
 

data/test/cxx/ApplicationPool2/SmartSpawnerTest.cpp

@@ -32,7 +32,6 @@ namespace tut {
 		~ApplicationPool2_SmartSpawnerTest() {
 			setLogLevel(DEFAULT_LOG_LEVEL);
 			unlink("stub/wsgi/passenger_wsgi.pyc");
-			Process::maybeShutdown(process);
 			PipeWatcher::onData = PipeWatcher::DataCallback();
 		}
 		
@@ -79,7 +78,8 @@ namespace tut {
 		options.startCommand = "ruby\1" "start.rb";
 		options.startupFile  = "start.rb";
 		shared_ptr<SmartSpawner> spawner = createSpawner(options);
-		spawner->spawn(options)->shutdown();
+		process = spawner->spawn(options);
+		process->requiresShutdown = false;
 		
 		kill(spawner->getPreloaderPid(), SIGTERM);
 		// Give it some time to exit.
@@ -87,7 +87,8 @@ namespace tut {
 		
 		// No exception at next spawn.
 		setLogLevel(-1);
-		spawner->spawn(options)->shutdown();
+		process = spawner->spawn(options);
+		process->requiresShutdown = false;
 	}
 	
 	TEST_METHOD(81) {
@@ -100,7 +101,8 @@ namespace tut {
 		setLogLevel(-1);
 		shared_ptr<SmartSpawner> spawner = createSpawner(options, true);
 		try {
-			spawner->spawn(options)->shutdown();
+			process = spawner->spawn(options);
+			process->requiresShutdown = false;
 			fail("SpawnException expected");
 		} catch (const SpawnException &) {
 			// Pass.
@@ -130,7 +132,8 @@ namespace tut {
 		spawner.getConfig()->forwardStderr = false;
 		
 		try {
-			spawner.spawn(options)->shutdown();
+			process = spawner.spawn(options);
+			process->requiresShutdown = false;
 			fail("SpawnException expected");
 		} catch (const SpawnException &e) {
 			ensure_equals(e.getErrorKind(),
@@ -161,7 +164,8 @@ namespace tut {
 		spawner.getConfig()->forwardStderr = false;
 		
 		try {
-			spawner.spawn(options)->shutdown();
+			process = spawner.spawn(options);
+			process->requiresShutdown = false;
 			fail("SpawnException expected");
 		} catch (const SpawnException &e) {
 			ensure_equals(e.getErrorKind(),
@@ -192,7 +196,8 @@ namespace tut {
 		spawner.getConfig()->forwardStderr = false;
 		
 		try {
-			spawner.spawn(options)->shutdown();
+			process = spawner.spawn(options);
+			process->requiresShutdown = false;
 			fail("SpawnException expected");
 		} catch (const SpawnException &e) {
 			ensure(containsSubstring(e["envvars"], "PASSENGER_FOO=foo\n"));