passenger 3.9.2.beta → 4.0.0.rc4

data/lib/phusion_passenger/request_handler.rb

@@ -431,50 +431,63 @@ private
 		initialization_state_mutex = Mutex.new
 		initialization_state_cond = ConditionVariable.new
 		initialization_state = {}
+		set_initialization_state = lambda do |value|
+			initialization_state_mutex.synchronize do
+				initialization_state[Thread.current] = value
+				initialization_state_cond.signal
+			end
+		end
+		set_initialization_state_to_true = lambda do
+			set_initialization_state.call(true)
+		end
 
 		# Actually start all the threads.
 		thread_handler = @thread_handler
+		expected_nthreads = 0
+
 		@threads_mutex.synchronize do
 			@concurrency.times do |i|
 				thread = Thread.new(i) do |number|
 					Thread.current.abort_on_exception = true
-					begin
-						Thread.current[:name] = "Worker #{number + 1}"
-						handler = thread_handler.new(self, main_socket_options)
-						handler.install
-						initialization_state_mutex.synchronize do
-							initialization_state[Thread.current] = true
-							initialization_state_cond.signal
-						end
-						handler.main_loop
-					ensure
-						initialization_state_mutex.synchronize do
-							initialization_state[Thread.current] = false
-							initialization_state_cond.signal
+					RobustInterruption.install
+					RobustInterruption.disable_interruptions do
+						begin
+							Thread.current[:name] = "Worker #{number + 1}"
+							handler = thread_handler.new(self, main_socket_options)
+							handler.install
+							handler.main_loop(set_initialization_state_to_true)
+						ensure
+							set_initialization_state.call(false)
+							unregister_current_thread
 						end
-						unregister_current_thread
 					end
 				end
 				@threads << thread
+				expected_nthreads += 1
 			end
 
 			thread = Thread.new do
 				Thread.current.abort_on_exception = true
-				begin
-					Thread.current[:name] = "HTTP helper worker"
-					handler = thread_handler.new(self, http_socket_options)
-					handler.install
-					handler.main_loop
-				ensure
-					unregister_current_thread
+				RobustInterruption.install
+				RobustInterruption.disable_interruptions do
+					begin
+						Thread.current[:name] = "HTTP helper worker"
+						handler = thread_handler.new(self, http_socket_options)
+						handler.install
+						handler.main_loop(set_initialization_state_to_true)
+					ensure
+						set_initialization_state.call(false)
+						unregister_current_thread
+					end
 				end
 			end
 			@threads << thread
+			expected_nthreads += 1
 		end
 
 		# Wait until all threads have finished starting.
 		initialization_state_mutex.synchronize do
-			while initialization_state.size != @concurrency
+			while initialization_state.size != expected_nthreads
 				initialization_state_cond.wait(initialization_state_mutex)
 			end
 		end

data/lib/phusion_passenger/request_handler/thread_handler.rb

@@ -91,18 +91,17 @@ class ThreadHandler
 		PhusionPassenger.call_event(:starting_request_handler_thread)
 	end
 
-	def main_loop
+	def main_loop(finish_callback)
 		socket_wrapper = Utils::UnseekableSocket.new
 		channel        = MessageChannel.new
 		buffer         = ''
 		buffer.force_encoding('binary') if buffer.respond_to?(:force_encoding)
 		
 		begin
-			disable_interruptions do
-				while !Utils::RobustInterruption.interrupted?
-					hijacked = accept_and_process_next_request(socket_wrapper, channel, buffer)
-					socket_wrapper = Utils::UnseekableSocket.new if hijacked
-				end
+			finish_callback.call
+			while !Utils::RobustInterruption.interrupted?
+				hijacked = accept_and_process_next_request(socket_wrapper, channel, buffer)
+				socket_wrapper = Utils::UnseekableSocket.new if hijacked
 			end
 		rescue Utils::RobustInterruption::Interrupted
 			# Do nothing.

data/lib/phusion_passenger/ruby_core_enhancements.rb

@@ -26,7 +26,13 @@ require 'rubygems'
 require 'socket'
 require 'thread'
 if (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby") && RUBY_VERSION < "1.8.7"
-	require 'fastthread'
+	begin
+		require 'fastthread'
+	rescue LoadError
+		abort "You are using a very old Ruby version. You must install " +
+			"the 'fastthread' gem to fix some bugs in the Ruby threading system: " +
+			"gem install fastthread"
+	end
 end
 require 'phusion_passenger/native_support'
 

data/lib/phusion_passenger/standalone/runtime_installer.rb

@@ -1,7 +1,7 @@
 #  encoding: utf-8
 #
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010, 2011, 2012 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -26,7 +26,6 @@ require 'fileutils'
 require 'phusion_passenger'
 require 'phusion_passenger/abstract_installer'
 require 'phusion_passenger/packaging'
-require 'phusion_passenger/dependencies'
 require 'phusion_passenger/common_library'
 require 'phusion_passenger/platform_info/ruby'
 require 'phusion_passenger/platform_info/binary_compatibility'
@@ -50,7 +49,7 @@ module Standalone
 #
 # If 'targets' contains :nginx, then you must also specify these options:
 # - nginx_dir: Nginx will be installed into this directory.
-# - support_dir: See below.
+# - support_dir: Path to the Phusion Passenger support binary files.
 # - nginx_version (optional): The Nginx version to download. If not given then a
 #   hardcoded version number will be used.
 # - nginx_tarball (optional): The location to the Nginx tarball. This tarball *must*
@@ -84,25 +83,30 @@ class RuntimeInstaller < AbstractInstaller
 	
 protected
 	def dependencies
-		result = [
-			Dependencies::GCC,
-			Dependencies::GnuMake,
-			Dependencies::DownloadTool,
-			Dependencies::Ruby_DevHeaders,
-			Dependencies::Ruby_OpenSSL,
-			Dependencies::RubyGems,
-			Dependencies::Rake,
-			Dependencies::Rack,
-			Dependencies::Curl_Dev,
-			Dependencies::OpenSSL_Dev,
-			Dependencies::Zlib_Dev,
-			Dependencies::PCRE_Dev,
-			Dependencies::Daemon_Controller,
+		specs = [
+			'depcheck_specs/compiler_toolchain',
+			'depcheck_specs/ruby',
+			'depcheck_specs/gems',
+			'depcheck_specs/libs',
+			'depcheck_specs/utilities'
 		]
-		if Dependencies.fastthread_required?
-			result << Dependencies::FastThread
-		end
-		return result
+		ids = [
+			'gcc',
+			'g++',
+			'gmake',
+			'download-tool',
+			'ruby-dev',
+			'ruby-openssl',
+			'rubygems',
+			'rake',
+			'rack',
+			'libcurl-dev',
+			'openssl-dev',
+			'zlib-dev',
+			'pcre-dev',
+			'daemon_controller >= 1.1.0'
+		]
+		return [specs, ids]
 	end
 	
 	def users_guide
@@ -291,7 +295,7 @@ private
 	
 	def extract_tarball(filename)
 		File.open(filename, 'rb') do |f|
-			IO.popen("tar xzf -", "w") do |io|
+			IO.popen("tar xzf -", "wb") do |io|
 				buffer = ''
 				buffer = buffer.force_encoding('binary') if buffer.respond_to?(:force_encoding)
 				total_size = File.size(filename)
@@ -494,15 +498,16 @@ private
 			end
 
 			system "rm -rf '#{@support_dir}'/{*.o,*.dSYM,libboost_oxt}"
-			system "rm -rf '#{@support_dir}'/*/{*.o,*.lo,*.h,*.log,Makefile,libtool,stamp-h1,config.status,.deps}"
+			system "rm -rf '#{@support_dir}'/*/{*.lo,*.h,*.log,Makefile,libtool,stamp-h1,config.status,.deps}"
+			system "rm -rf '#{@support_dir}'/{libeio,libev}/*.o"
 			
 			# Retain only the object files that are needed for linking the Phusion Passenger module into Nginx.
 			nginx_libs = COMMON_LIBRARY.
 				only(*NGINX_LIBS_SELECTOR).
 				set_output_dir("#{@support_dir}/libpassenger_common").
 				link_objects
-			(Dir["#{@support_dir}/libpassenger_common/**/*"] - nginx_libs).each do |filename|
-				if File.file?(filename)
+			Dir["#{@support_dir}/libpassenger_common/**/*"].each do |filename|
+				if !nginx_libs.include?(filename) && File.file?(filename)
 					File.unlink(filename)
 				end
 			end
@@ -513,6 +518,19 @@ private
 	def install_nginx_from_source(source_dir)
 		require 'phusion_passenger/platform_info/compiler'
 		Dir.chdir(source_dir) do
+			shell = PlatformInfo.find_command('bash') || "sh"
+			command = ""
+			if @targets.include?(:support_binaries)
+				if ENV['PASSENGER_DEBUG'] && !ENV['PASSENGER_DEBUG'].empty?
+					output_dir = "#{PhusionPassenger.source_root}/libout/common/libpassenger_common"
+				else
+					output_dir = "#{@support_dir}/libpassenger_common"
+				end
+				nginx_libs = COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).
+					set_output_dir(output_dir).
+					link_objects_as_string
+				command << "env PASSENGER_LIBS='#{nginx_libs} #{output_dir}/../libboost_oxt.a' "
+			end
 			# RPM thinks it's being smart by scanning binaries for
 			# paths and refusing to create package if it detects any
 			# hardcoded thats that point to /usr or other important
@@ -521,15 +539,6 @@ private
 			# we pass it its resource locations during runtime, so
 			# work around the problem by configure Nginx with prefix
 			# /tmp.
-			shell = PlatformInfo.find_command('bash') || "sh"
-			command = ""
-			if @targets.include?(:support_binaries)
-				nginx_libs = COMMON_LIBRARY.
-					only(*NGINX_LIBS_SELECTOR).
-					set_output_dir("#{PhusionPassenger.source_root}/libout/common/libpassenger_common").
-					link_objects_as_string
-				command << "env PASSENGER_LIBS='#{nginx_libs} #{@support_dir}/libboost_oxt.a' "
-			end
 			command << "#{shell} ./configure --prefix=/tmp " <<
 				"--with-cc-opt='-Wno-error' " <<
 				"--without-http_fastcgi_module " <<

data/lib/phusion_passenger/utils/robust_interruption.rb

@@ -39,7 +39,7 @@ module RobustInterruption
 		end
 
 		def pop_interruption_flag
-			raise "BUG - cannot pop interruption flag in this state" if @interruption_flags.size <= 1
+			Kernel.raise "BUG - cannot pop interruption flag in this state" if @interruption_flags.size <= 1
 			@interruption_flags.pop
 		end
 	end
@@ -52,27 +52,43 @@ module RobustInterruption
 		RobustInterruption.install
 	end
 
+	def installed?(thread = Thread.current)
+		return !!thread[:robust_interruption]
+	end
+	module_function :installed?
+
 	def interrupted?(thread = Thread.current)
-		data = thread[:robust_interruption]
-		return data && data.interrupted?
+		if data = thread[:robust_interruption]
+			return data.interrupted?
+		else
+			Kernel.raise "RobustThreadInterruption not installed for #{thread}"
+		end
 	end
 	module_function :interrupted?
 
 	def self.raise(thread, exception = Interrupted)
-		RobustInterruption.disable_interruptions do
-			data = thread[:robust_interruption]
-			if data
-				data.interrupted = true
-				if data.try_lock
-					begin
-						thread.raise(exception)
-					ensure
-						data.unlock
-					end
+		if installed?
+			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
 				end
-			else
-				thread.raise(exception)
 			end
+		else
+			Kernel.raise "RobustThreadInterruption not installed for #{thread}"
 		end
 	end
 
@@ -89,7 +105,7 @@ module RobustInterruption
 				data.unlock if was_interruptable
 			end
 		else
-			yield
+			Kernel.raise "RobustThreadInterruption not installed for #{thread}"
 		end
 	end
 	module_function :disable_interruptions
@@ -107,7 +123,7 @@ module RobustInterruption
 				data.pop_interruption_flag
 			end
 		else
-			yield
+			Kernel.raise "RobustThreadInterruption not installed for #{thread}"
 		end
 	end
 	module_function :enable_interruptions
@@ -128,7 +144,7 @@ module RobustInterruption
 				end
 			end
 		else
-			yield
+			Kernel.raise "RobustThreadInterruption not installed for #{thread}"
 		end
 	end
 	module_function :restore_interruptions

data/passenger.gemspec

@@ -0,0 +1,25 @@
+source_root = File.expand_path(File.dirname(__FILE__))
+$LOAD_PATH.unshift("#{source_root}/lib")
+require 'phusion_passenger'
+PhusionPassenger.locate_directories
+require 'phusion_passenger/packaging'
+
+Gem::Specification.new do |s|
+	s.platform = Gem::Platform::RUBY
+	s.homepage = "https://www.phusionpassenger.com/"
+	s.summary = "Easy and robust Ruby web application deployment"
+	s.name = PhusionPassenger::PACKAGE_NAME
+	s.version = PhusionPassenger::VERSION_STRING
+	s.rubyforge_project = "passenger"
+	s.author = "Phusion - http://www.phusion.nl/"
+	s.email = "info@phusion.nl"
+	s.require_paths = ["lib"]
+	s.add_dependency 'rake', '>= 0.8.1'
+	s.add_dependency 'daemon_controller', '>= 1.1.0'
+	s.add_dependency 'rack'
+	s.files = Dir[*PhusionPassenger::Packaging::GLOB] -
+		Dir[*PhusionPassenger::Packaging::EXCLUDE_GLOB]
+	s.executables = PhusionPassenger::Packaging::USER_EXECUTABLES +
+		PhusionPassenger::Packaging::SUPER_USER_EXECUTABLES
+	s.description = "Easy and robust Ruby web application deployment."
+end

data/resources/templates/standalone/config.erb

@@ -56,9 +56,10 @@ http {
     <% end %>
     
     default_type application/octet-stream;
-    client_max_body_size 50m;
+    client_max_body_size 1024m;
     access_log off;
     keepalive_timeout 60;
+    underscores_in_headers on;
     gzip on;
     gzip_comp_level 3;
     gzip_min_length 150;
@@ -85,6 +86,7 @@ http {
         listen <%= nginx_listen_address(app) %>;
         server_name <%= app[:server_names].join(' ') %>;
         root '<%= app[:root] %>/public';
+        passenger_app_root '<%= app[:root] %>';
         passenger_enabled on;
         rails_env <%= app[:env] %>;
         passenger_spawn_method <%= app[:spawn_method] %>;

data/test/config.json.travis

@@ -9,7 +9,7 @@
   "nonexistant_user": "xxxxxxxxxxxxxxxxxxx",
   "nonexistant_group": "xxxxxxxxxxxxxxxxxxx",
   "nonexistant_uid": 9999,
-  "nonexistant_gid": 9999
+  "nonexistant_gid": 9999,
 
-  // nginx: /usr/local/sbin/nginx
+  "nginx": "/tmp/nginx/sbin/nginx"
 }

data/test/cxx/ApplicationPool2/DirectSpawnerTest.cpp

@@ -1,5 +1,5 @@
 #include <TestSupport.h>
-#include <ApplicationPool2/Spawner.h>
+#include <ApplicationPool2/DirectSpawner.h>
 #include <Utils/json.h>
 #include <fcntl.h>
 
@@ -11,14 +11,24 @@ namespace tut {
 		ServerInstanceDirPtr serverInstanceDir;
 		ServerInstanceDir::GenerationPtr generation;
 		BackgroundEventLoop bg;
+		ProcessPtr process;
+		PipeWatcher::DataCallback gatherOutput;
+		string gatheredOutput;
+		boost::mutex gatheredOutputSyncher;
 		
 		ApplicationPool2_DirectSpawnerTest() {
 			createServerInstanceDirAndGeneration(serverInstanceDir, generation);
 			bg.start();
+			PipeWatcher::onData = PipeWatcher::DataCallback();
+			gatherOutput = boost::bind(&ApplicationPool2_DirectSpawnerTest::_gatherOutput, this, _1, _2);
+			setLogLevel(LVL_ERROR); // TODO: change to LVL_WARN
 		}
 
 		~ApplicationPool2_DirectSpawnerTest() {
+			setLogLevel(DEFAULT_LOG_LEVEL);
 			unlink("stub/wsgi/passenger_wsgi.pyc");
+			Process::maybeShutdown(process);
+			PipeWatcher::onData = PipeWatcher::DataCallback();
 		}
 		
 		shared_ptr<DirectSpawner> createSpawner(const Options &options) {
@@ -32,6 +42,11 @@ namespace tut {
 			options.loadShellEnvvars = false;
 			return options;
 		}
+
+		void _gatherOutput(const char *data, unsigned int size) {
+			lock_guard<boost::mutex> l(gatheredOutputSyncher);
+			gatheredOutput.append(data, size);
+		}
 	};
 
 	DEFINE_TEST_GROUP_WITH_LIMIT(ApplicationPool2_DirectSpawnerTest, 90);
@@ -57,8 +72,7 @@ namespace tut {
 		} catch (const SpawnException &e) {
 			ensure_equals(e.getErrorKind(),
 				SpawnException::APP_STARTUP_TIMEOUT);
-			ensure_equals(e.getErrorPage(),
-				"hello world\n");
+			ensure(e.getErrorPage().find("hello world\n") != string::npos);
 		}
 	}
 	
@@ -80,8 +94,26 @@ namespace tut {
 		} catch (const SpawnException &e) {
 			ensure_equals(e.getErrorKind(),
 				SpawnException::APP_STARTUP_PROTOCOL_ERROR);
-			ensure_equals(e.getErrorPage(),
-				"hello world\n");
+			ensure(e.getErrorPage().find("hello world\n") != string::npos);
 		}
 	}
+
+	TEST_METHOD(82) {
+		SHOW_EXCEPTION_BACKTRACE(
+		// Test that everything works correctly if the app re-execs() itself.
+		// https://code.google.com/p/phusion-passenger/issues/detail?id=842#c19
+		Options options = createOptions();
+		options.appRoot      = "stub/rack";
+		options.startCommand = "ruby\1" "start.rb\1" "--execself";
+		options.startupFile  = "start.rb";
+		SpawnerPtr spawner = createSpawner(options);
+		process = spawner->spawn(options);
+		ensure_equals(process->sockets->size(), 1u);
+		
+		Connection conn = process->sockets->front().checkoutConnection();
+		ScopeGuard guard(boost::bind(checkin, process, &conn));
+		writeExact(conn.fd, "ping\n");
+		ensure_equals(readAll(conn.fd), "pong\n");
+		);
+	}
 }