passenger 2.2.2 → 2.2.3

data/ext/nginx/ngx_http_passenger_module.h

@@ -64,9 +64,9 @@ extern ngx_str_t    passenger_helper_server_password;
 extern const char   passenger_helper_server_socket[NGX_MAX_PATH];
 
 /**
- * A CachedMultiFileStat object used for caching stat() calls.
+ * A CachedFileStat object used for caching stat() calls.
  */
-extern CachedMultiFileStat *passenger_stat_cache;
+extern CachedFileStat *passenger_stat_cache;
 
 #endif /* _PASSENGER_NGINX_MODULE_H_ */
 

data/lib/phusion_passenger/abstract_request_handler.rb

@@ -97,8 +97,6 @@ class AbstractRequestHandler
 	IGNORE              = 'IGNORE'              # :nodoc:
 	DEFAULT             = 'DEFAULT'             # :nodoc:
 	NULL                = "\0"                  # :nodoc:
-	CONTENT_LENGTH      = 'CONTENT_LENGTH'      # :nodoc:
-	HTTP_CONTENT_LENGTH = 'HTTP_CONTENT_LENGTH' # :nodoc:
 	X_POWERED_BY        = 'X-Powered-By'        # :nodoc:
 	REQUEST_METHOD      = 'REQUEST_METHOD'      # :nodoc:
 	PING                = 'ping'                # :nodoc:
@@ -144,11 +142,13 @@ class AbstractRequestHandler
 		@socket.close_on_exec!
 		@owner_pipe = owner_pipe
 		@previous_signal_handlers = {}
+		@main_loop_generation  = 0
 		@main_loop_thread_lock = Mutex.new
 		@main_loop_thread_cond = ConditionVariable.new
 		@memory_limit = options["memory_limit"] || 0
 		@iterations = 0
 		@processed_requests = 0
+		@main_loop_running = false
 	end
 	
 	# Clean up temporary stuff created by the request handler.
@@ -160,7 +160,9 @@ class AbstractRequestHandler
 	# may be called at any time, and it will stop the main loop thread.
 	def cleanup
 		if @main_loop_thread
-			@main_loop_thread.raise(Interrupt.new("Cleaning up"))
+			@main_loop_thread_lock.synchronize do
+				@graceful_termination_pipe[1].close rescue nil
+			end
 			@main_loop_thread.join
 		end
 		@socket.close rescue nil
@@ -182,6 +184,7 @@ class AbstractRequestHandler
 			@graceful_termination_pipe[1].close_on_exec!
 			
 			@main_loop_thread_lock.synchronize do
+				@main_loop_generation += 1
 				@main_loop_running = true
 				@main_loop_thread_cond.broadcast
 			end
@@ -226,10 +229,11 @@ class AbstractRequestHandler
 				raise
 			end
 		ensure
-			@graceful_termination_pipe[0].close rescue nil
-			@graceful_termination_pipe[1].close rescue nil
 			revert_signal_handlers
 			@main_loop_thread_lock.synchronize do
+				@graceful_termination_pipe[0].close rescue nil
+				@graceful_termination_pipe[1].close rescue nil
+				@main_loop_generation += 1
 				@main_loop_running = false
 				@main_loop_thread_cond.broadcast
 			end
@@ -238,11 +242,12 @@ class AbstractRequestHandler
 	
 	# Start the main loop in a new thread. This thread will be stopped by #cleanup.
 	def start_main_loop_thread
+		current_generation = @main_loop_generation
 		@main_loop_thread = Thread.new do
 			main_loop
 		end
 		@main_loop_thread_lock.synchronize do
-			while !@main_loop_running
+			while @main_loop_generation == current_generation
 				@main_loop_thread_cond.wait(@main_loop_thread_lock)
 			end
 		end
@@ -399,6 +404,10 @@ private
 				undef rewind if respond_to?(:rewind)
 			end
 			
+			# Set encoding for Ruby 1.9 compatibility.
+			client.set_encoding(Encoding::BINARY) if client.respond_to?(:set_encoding)
+			client.binmode
+			
 			return client
 		else
 			# The other end of the owner pipe has been closed, or the
@@ -422,7 +431,6 @@ private
 			return
 		end
 		headers = Hash[*headers_data.split(NULL)]
-		headers[CONTENT_LENGTH] = headers[HTTP_CONTENT_LENGTH]
 		return [headers, socket]
 	rescue SecurityError => e
 		STDERR.puts("*** Passenger RequestHandler: HTTP header size exceeded maximum.")

data/lib/phusion_passenger/abstract_server.rb

@@ -124,7 +124,7 @@ class AbstractServer
 		if started?
 			raise ServerAlreadyStarted, "Server is already started"
 		end
-	
+		
 		@parent_socket, @child_socket = UNIXSocket.pair
 		before_fork
 		@pid = fork
@@ -138,7 +138,12 @@ class AbstractServer
 				# on a white list of file descriptors. That proved to be way too fragile:
 				# too many file descriptors are being left open even though they shouldn't
 				# be. So now we close file descriptors based on a black list.
-				file_descriptors_to_leave_open = [0, 1, 2, @child_socket.fileno]
+				#
+				# Note that STDIN, STDOUT and STDERR may be temporarily set to
+				# different file descriptors than 0, 1 and 2, e.g. in unit tests.
+				# We don't want to close these either.
+				file_descriptors_to_leave_open = [0, 1, 2, @child_socket.fileno,
+					fileno_of(STDIN), fileno_of(STDOUT), fileno_of(STDERR)].compact.uniq
 				NativeSupport.close_all_file_descriptors(file_descriptors_to_leave_open)
 				# In addition to closing the file descriptors, one must also close
 				# the associated IO objects. This is to prevent IO.close from
@@ -151,6 +156,9 @@ class AbstractServer
 				# clear all open file handles.
 				Gem.clear_paths
 				
+				# Reseed pseudo-random number generator for security reasons.
+				srand
+				
 				start_synchronously(@child_socket)
 			rescue Interrupt
 				# Do nothing.
@@ -292,6 +300,12 @@ protected
 	def quit_main
 		@done = true
 	end
+	
+	def fileno_of(io)
+		return io.fileno
+	rescue
+		return nil
+	end
 
 private
 	# Reset all signal handlers to default. This is called in the child process,

data/lib/phusion_passenger/admin_tools/control_process.rb

@@ -23,6 +23,7 @@
 
 require 'rexml/document'
 require 'fileutils'
+require 'socket'
 require 'phusion_passenger/admin_tools'
 require 'phusion_passenger/message_channel'
 
@@ -79,37 +80,30 @@ class ControlProcess
 	end
 	
 	def status
-		reload
-		return @status
-	end
-	
-	def xml
-		reload
-		return @xml
+		connect do |channel|
+			channel.write("status")
+			return channel.read_scalar
+		end
 	end
 	
-	def domains
-		reload
-		return @domains
+	def backtraces
+		connect do |channel|
+			channel.write("backtraces")
+			return channel.read_scalar
+		end
 	end
 	
-	def instances
-		return domains.map do |domain|
-			domain[:instances]
-		end.flatten
+	def xml
+		connect do |channel|
+			channel.write("status_xml")
+			return channel.read_scalar
+		end
 	end
 	
-private
-	def reload
-		return if @status
-		File.open("#{path}/info/status.fifo", 'r') do |f|
-			channel = MessageChannel.new(f)
-			@status = channel.read_scalar
-			@xml = channel.read_scalar
-		end
-		doc = REXML::Document.new(@xml)
+	def domains
+		doc = REXML::Document.new(xml)
 		
-		@domains = []
+		domains = []
 		doc.elements.each("info/domains/domain") do |domain|
 			instances = []
 			d = {
@@ -130,7 +124,24 @@ private
 				end
 				instances << i
 			end
-			@domains << d
+			domains << d
+		end
+		return domains
+	end
+	
+	def instances
+		return domains.map do |domain|
+			domain[:instances]
+		end.flatten
+	end
+	
+private
+	def connect
+		channel = MessageChannel.new(UNIXSocket.new("#{path}/info/status.socket"))
+		begin
+			yield channel
+		ensure
+			channel.close
 		end
 	end
 end

data/lib/phusion_passenger/constants.rb

@@ -24,7 +24,7 @@
 module PhusionPassenger
 	# Phusion Passenger version number.
 	# Don't forget to edit ext/common/Version.h too.
-	VERSION_STRING = '2.2.2'
+	VERSION_STRING = '2.2.3'
 	
 	DEFAULT_FRAMEWORK_SPAWNER_MAX_IDLE_TIME = 30 * 60
 	DEFAULT_APP_SPAWNER_MAX_IDLE_TIME       = 10 * 60

data/lib/phusion_passenger/dependencies.rb

@@ -296,6 +296,16 @@ module Dependencies # :nodoc: all
 				result.found(PlatformInfo.apu_config)
 			end
 		end
+		if RUBY_PLATFORM =~ /linux/
+			case PlatformInfo.linux_distro
+			when :ubuntu, :debian
+				dep.install_command = "apt-get install libaprutil1-dev"
+			end
+		elsif RUBY_PLATFORM =~ /darwin/
+			dep.install_instructions = "Please install Apache from MacPorts, which will " <<
+				"provide APU automatically. <b>Or</b>, if you're installing against MacOS X's " <<
+				"default provided Apache, then please install the OS X Developer SDK."
+		end
 		dep.website = "http://httpd.apache.org/"
 		dep.website_comments = "APR Utility is an integrated part of Apache."
 	end

data/lib/phusion_passenger/platform_info.rb

@@ -339,7 +339,7 @@ public
 		# _GLIBCPP__PTHREADS is for fixing Boost compilation on OpenBSD.
 		flags = ["-D_REENTRANT -I/usr/local/include"]
 		if RUBY_PLATFORM =~ /solaris/
-			flags << '-D_XOPEN_SOURCE=500 -D_XPG4_2 -D__EXTENSIONS__ -D__SOLARIS__'
+			flags << '-D_XOPEN_SOURCE=500 -D_XPG4_2 -D__EXTENSIONS__ -D__SOLARIS__ -D_FILE_OFFSET_BITS=64'
 			flags << '-DBOOST_HAS_STDINT_H' unless RUBY_PLATFORM =~ /solaris2.9/
 			flags << '-D__SOLARIS9__ -DBOOST__STDC_CONSTANT_MACROS_DEFINED' if RUBY_PLATFORM =~ /solaris2.9/
 			flags << '-mcpu=ultrasparc' if RUBY_PLATFORM =~ /sparc/

data/lib/phusion_passenger/rack/application_spawner.rb

@@ -49,6 +49,8 @@ class ApplicationSpawner
 	# Application object will be returned, which represents the spawned
 	# application.
 	#
+	# Accepts the same options as Railz::ApplicationSpawner#initialize.
+	#
 	# Raises:
 	# - AppInitError: The Rack application raised an exception or called
 	#   exit() during startup.
@@ -70,7 +72,7 @@ class ApplicationSpawner
 		Process.waitpid(pid) rescue nil
 		
 		channel = MessageChannel.new(a)
-		unmarshal_and_raise_errors(channel, "rack")
+		unmarshal_and_raise_errors(channel, !!options["print_exceptions"], "rack")
 		
 		# No exception was raised, so spawning succeeded.
 		pid, socket_name, socket_type = channel.read
@@ -83,13 +85,19 @@ class ApplicationSpawner
 	end
 
 private
-	
 	def run(channel, app_root, options)
 		$0 = "Rack: #{app_root}"
 		app = nil
 		success = report_app_init_status(channel) do
 			ENV['RACK_ENV'] = options["environment"]
+			if options["base_uri"] && options["base_uri"] != "/"
+				ENV['RACK_BASE_URI'] = options["base_uri"]
+				ENV['RAILS_RELATIVE_URL_ROOT'] = options["base_uri"]
+			end
 			Dir.chdir(app_root)
+			if options["environment_variables"]
+				set_passed_environment_variables(options["environment_variables"])
+			end
 			if options["lower_privilege"]
 				lower_privilege('config.ru', options["lowest_user"])
 			end
@@ -116,6 +124,17 @@ private
 			end
 		end
 	end
+	
+	def set_passed_environment_variables(encoded_environment_variables)
+		env_vars_string = encoded_environment_variables.unpack("m").first
+		# Prevent empty string as last item from b0rking the Hash[...] statement.
+		# See comment in Hooks.cpp (sendHeaders) for details.
+		env_vars_string << "_\0_"
+		env_vars = Hash[*env_vars_string.split("\0")]
+		env_vars.each_pair do |key, value|
+			ENV[key] = value
+		end
+	end
 
 	def load_rack_app
 		rackup_code = ::File.read("config.ru")

data/lib/phusion_passenger/rack/request_handler.rb

@@ -45,6 +45,9 @@ class RequestHandler < AbstractRequestHandler
 	PATH_INFO          = "PATH_INFO"           # :nodoc:
 	REQUEST_URI        = "REQUEST_URI"         # :nodoc:
 	QUESTION_MARK      = "?"                   # :nodoc:
+	QUERY_STRING       = "QUERY_STRING"        # :nodoc:
+	CONTENT_LENGTH      = "CONTENT_LENGTH"       # :nodoc:
+	HTTP_CONTENT_LENGTH = "HTTP_CONTENT_LENGTH"  # :nodoc:
 	HTTPS          = "HTTPS"  # :nodoc:
 	HTTPS_DOWNCASE = "https"  # :nodoc:
 	HTTP           = "http"   # :nodoc:
@@ -70,8 +73,15 @@ protected
 			env[RACK_MULTITHREAD]  = false
 			env[RACK_MULTIPROCESS] = true
 			env[RACK_RUN_ONCE]     = false
+			env[QUERY_STRING]    ||= ""
 			env[PATH_INFO]       ||= env[REQUEST_URI].split(QUESTION_MARK, 2).first
 			env[PATH_INFO].sub!(/^#{Regexp.escape(env[SCRIPT_NAME])}/, "")
+			if env[HTTP_CONTENT_LENGTH] && env[CONTENT_LENGTH]
+				env.delete(HTTP_CONTENT_LENGTH)
+			elsif env[HTTP_CONTENT_LENGTH] && !env[CONTENT_LENGTH]
+				env[CONTENT_LENGTH] = env[HTTP_CONTENT_LENGTH]
+				env.delete(HTTP_CONTENT_LENGTH)
+			end
 			if env[HTTPS] == YES || env[HTTPS] == ON || env[HTTPS] == ONE
 				env[RACK_URL_SCHEME] = HTTPS_DOWNCASE
 			else

data/lib/phusion_passenger/railz/application_spawner.rb

@@ -84,6 +84,20 @@ class ApplicationSpawner < AbstractServer
 	# - +environment+:
 	#   Allows one to specify the RAILS_ENV environment to use.
 	#
+	# - +environment_variables+:
+	#   Environment variables which should be passed to the spawned application.
+	#   This is NULL-seperated string of key-value pairs, encoded in base64.
+	#   The last byte in the unencoded data must be a NULL.
+	#
+	# - +base_uri+:
+	#   The base URI on which this application is deployed. It equals "/"
+	#   string if the application is deployed on the root URI. It must not
+	#   equal the empty string.
+	#
+	# - +print_exceptions+:
+	#   Whether exceptions that have occurred during application initialization
+	#   should be printed to STDERR. The default is true.
+	#
 	# All other options will be passed on to RequestHandler.
 	def initialize(app_root, options = {})
 		super()
@@ -93,6 +107,9 @@ class ApplicationSpawner < AbstractServer
 		@lower_privilege = @options["lower_privilege"]
 		@lowest_user     = @options["lowest_user"]
 		@environment     = @options["environment"]
+		@encoded_environment_variables = @options["environment_variables"]
+		@base_uri = @options["base_uri"] if @options["base_uri"] && @options["base_uri"] != "/"
+		@print_exceptions = @options["print_exceptions"]
 		self.max_idle_time = DEFAULT_APP_SPAWNER_MAX_IDLE_TIME
 		assert_valid_app_root(@app_root)
 		define_message_handler(:spawn_application, :handle_spawn_application)
@@ -144,7 +161,11 @@ class ApplicationSpawner < AbstractServer
 				channel = MessageChannel.new(b)
 				success = report_app_init_status(channel) do
 					ENV['RAILS_ENV'] = @environment
+					ENV['RAILS_RELATIVE_URL_ROOT'] = @base_uri
 					Dir.chdir(@app_root)
+					if @encoded_environment_variables
+						set_passed_environment_variables
+					end
 					if @lower_privilege
 						lower_privilege('config/environment.rb', @lowest_user)
 					end
@@ -170,7 +191,7 @@ class ApplicationSpawner < AbstractServer
 		Process.waitpid(pid) rescue nil
 		
 		channel = MessageChannel.new(a)
-		unmarshal_and_raise_errors(channel)
+		unmarshal_and_raise_errors(channel, @print_exceptions)
 		
 		# No exception was raised, so spawning succeeded.
 		pid, socket_name, socket_type = channel.read
@@ -191,7 +212,7 @@ class ApplicationSpawner < AbstractServer
 	def start
 		super
 		begin
-			unmarshal_and_raise_errors(server)
+			unmarshal_and_raise_errors(server, @print_exceptions)
 		rescue IOError, SystemCallError, SocketError => e
 			stop
 			raise Error, "The application spawner server exited unexpectedly: #{e}"
@@ -216,11 +237,15 @@ protected
 		report_app_init_status(client) do
 			$0 = "Passenger ApplicationSpawner: #{@app_root}"
 			ENV['RAILS_ENV'] = @environment
+			ENV['RAILS_RELATIVE_URL_ROOT'] = @base_uri
 			if defined?(RAILS_ENV)
 				Object.send(:remove_const, :RAILS_ENV)
 				Object.const_set(:RAILS_ENV, ENV['RAILS_ENV'])
 			end
 			Dir.chdir(@app_root)
+			if @encoded_environment_variables
+				set_passed_environment_variables
+			end
 			if @lower_privilege
 				lower_privilege('config/environment.rb', @lowest_user)
 			end
@@ -229,6 +254,17 @@ protected
 	end
 	
 private
+	def set_passed_environment_variables
+		env_vars_string = @encoded_environment_variables.unpack("m").first
+		# Prevent empty string as last item from b0rking the Hash[...] statement.
+		# See comment in Hooks.cpp (sendHeaders) for details.
+		env_vars_string << "_\0_"
+		env_vars = Hash[*env_vars_string.split("\0")]
+		env_vars.each_pair do |key, value|
+			ENV[key] = value
+		end
+	end
+	
 	def preload_application
 		Object.const_set(:RAILS_ROOT, @canonicalized_app_root)
 		if defined?(::Rails::Initializer)

data/lib/phusion_passenger/railz/framework_spawner.rb

@@ -58,6 +58,9 @@ class FrameworkSpawner < AbstractServer
 	#   this version is actually installed.
 	# - <tt>:vendor</tt>: The directory to the vendor Rails framework to use. This is
 	#   usually something like "/webapps/foo/vendor/rails".
+	# - <tt>:print_framework_loading_exceptions</tt>:
+	#   Whether exceptions that have occurred while loading the Ruby on Rails framework
+	#   should be printed to STDERR. The default is true.
 	#
 	# It is not allowed to specify both +version+ and +vendor+.
 	#
@@ -72,6 +75,11 @@ class FrameworkSpawner < AbstractServer
 		end
 		@version = options[:version]
 		@vendor  = options[:vendor]
+		if options.has_key?(:print_framework_loading_exceptions)
+			@print_framework_loading_exceptions = options[:print_framework_loading_exceptions]
+		else
+			@print_framework_loading_exceptions = true
+		end
 		if !@version && !@vendor
 			raise ArgumentError, "Either the 'version' or the 'vendor' option must specified"
 		elsif @version && @vendor
@@ -87,7 +95,7 @@ class FrameworkSpawner < AbstractServer
 	# Overrided from AbstractServer#start.
 	#
 	# May raise these additional exceptions:
-	# - FrameworkInitError: The specified Ruby on Rails framework could not be loaded.
+	# - FrameworkInitError: An error occurred while loading the specified Ruby on Rails framework.
 	# - FrameworkSpawner::Error: The FrameworkSpawner server exited unexpectedly.
 	def start
 		super
@@ -109,6 +117,9 @@ class FrameworkSpawner < AbstractServer
 						"#{child_exception.class} (#{child_exception.message})"
 				end
 				options = { :vendor => @vendor, :version => @version }
+				if @print_framework_loading_exceptions
+					print_exception(self.class.to_s, child_exception)
+				end
 				raise FrameworkInitError.new(message, child_exception, options)
 			end
 		rescue IOError, SystemCallError, SocketError
@@ -122,23 +133,7 @@ class FrameworkSpawner < AbstractServer
 	# When successful, an Application object will be returned, which represents
 	# the spawned RoR application.
 	#
-	# The following options are allowed:
-	# - +lower_privilege+ and +lowest_user+:
-	#   If +lower_privilege+ is true, then ApplicationSpawner will attempt to
-	#   switch to the user who owns the application's <tt>config/environment.rb</tt>,
-	#   and to the default group of that user.
-	#
-	#   If that user doesn't exist on the system, or if that user is root,
-	#   then ApplicationSpawner will attempt to switch to the username given by
-	#   +lowest_user+ (and to the default group of that user).
-	#   If +lowest_user+ doesn't exist either, or if switching user failed
-	#   (because the current process does not have the privilege to do so),
-	#   then ApplicationSpawner will continue without reporting an error.
-	#
-	# - +environment+:
-	#   Allows one to specify the RAILS_ENV environment to use.
-	#
-	# All other options will be passed on to ApplicationSpawner and RequestHandler.
+	# All options accepted by ApplicationSpawner.new and RequestHandler.new are accepted.
 	#
 	# FrameworkSpawner will internally cache the code of applications, in order to
 	# speed up future spawning attempts. This implies that, if you've changed
@@ -148,7 +143,7 @@ class FrameworkSpawner < AbstractServer
 	#
 	# Raises:
 	# - AbstractServer::ServerNotStarted: The FrameworkSpawner server hasn't already been started.
-	# - InvalidAppRoot: +app_root+ doesn't appear to be a valid Ruby on Rails application root.
+	# - InvalidPath: +app_root+ doesn't appear to be a valid Ruby on Rails application root.
 	# - AppInitError: The application raised an exception or called exit() during startup.
 	# - ApplicationSpawner::Error: The ApplicationSpawner server exited unexpectedly.
 	# - FrameworkSpawner::Error: The FrameworkSpawner server exited unexpectedly.
@@ -156,8 +151,12 @@ class FrameworkSpawner < AbstractServer
 		assert_valid_app_root(app_root)
 		options = sanitize_spawn_options(options)
 		options["app_root"] = app_root
+		# No need for the ApplicationSpawner to print exceptions. All
+		# exceptions raised by the ApplicationSpawner are sent back here,
+		# so we just need to decide here whether we want to print it.
+		print_exceptions = options["print_exceptions"]
+		options["print_exceptions"] = false
 		
-		exception_to_propagate = nil
 		begin
 			server.write("spawn_application", *options.to_a.flatten)
 			result = server.read
@@ -166,8 +165,10 @@ class FrameworkSpawner < AbstractServer
 			end
 			if result[0] == 'exception'
 				e = unmarshal_exception(server.read_scalar)
-				if e.respond_to?(:child_exception) && e.child_exception
-					#print_exception(self.class.to_s, e.child_exception)
+				if print_exceptions && e.respond_to?(:child_exception) && e.child_exception
+					print_exception(self.class.to_s, e.child_exception)
+				elsif print_exceptions
+					print_exception(self.class.to_s, e)
 				end
 				raise e
 			else
@@ -276,10 +277,7 @@ private
 	end
 
 	def handle_spawn_application(*options)
-		options = Hash[*options]
-		options["lower_privilege"]     = options["lower_privilege"] == "true"
-		options["app_spawner_timeout"] = options["app_spawner_timeout"].to_i
-		options["memory_limit"]        = options["memory_limit"].to_i
+		options = sanitize_spawn_options(Hash[*options])
 		
 		app = nil
 		app_root = options["app_root"]
@@ -293,10 +291,10 @@ private
 					spawner.start
 					spawner
 				end
-			rescue ArgumentError, AppInitError, ApplicationSpawner::Error => e
+			rescue InvalidPath, AppInitError, ApplicationSpawner::Error => e
 				client.write('exception')
 				client.write_scalar(marshal_exception(e))
-				if e.child_exception.is_a?(LoadError)
+				if e.respond_to?(:child_exception) && e.child_exception.is_a?(LoadError)
 					# A source file failed to load, maybe because of a
 					# missing gem. If that's the case then the sysadmin
 					# will install probably the gem. So we clear RubyGems's