passenger 3.9.2.beta → 4.0.0.rc4

data/lib/phusion_passenger.rb

@@ -1,6 +1,6 @@
 # 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.
 #
@@ -28,10 +28,12 @@ module PhusionPassenger
 	
 	###### Version numbers ######
 	
+	PACKAGE_NAME = 'passenger'
+	
 	# Phusion Passenger version number. Don't forget to edit ext/common/Constants.h too.
-	VERSION_STRING = '3.9.2.beta'
+	VERSION_STRING = '4.0.0.rc4'
 	
-	PREFERRED_NGINX_VERSION = '1.2.6'
+	PREFERRED_NGINX_VERSION = '1.2.7'
 	PREFERRED_PCRE_VERSION  = '8.31'
 	STANDALONE_INTERFACE_VERSION  = 1
 	

data/lib/phusion_passenger/abstract_installer.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -106,30 +106,26 @@ protected
 	end
 	
 	def dependencies
-		return []
+		return [[], []]
 	end
 	
 	def check_dependencies(show_new_screen = true)
 		new_screen if show_new_screen
-		missing_dependencies = []
 		puts "<banner>Checking for required software...</banner>"
 		puts
-		dependencies.each do |dep|
-			print " * #{dep.name}... "
-			result = dep.check
-			if result.found?
-				if result.found_at
-					puts "<green>found at #{result.found_at}</green>"
-				else
-					puts "<green>found</green>"
-				end
-			else
-				puts "<red>not found</red>"
-				missing_dependencies << dep
-			end
-		end
 		
-		if missing_dependencies.empty?
+		require 'phusion_passenger/platform_info/depcheck'
+		specs, ids = dependencies
+		runner = PlatformInfo::Depcheck::ConsoleRunner.new
+
+		specs.each do |spec|
+			PlatformInfo::Depcheck.load(spec)
+		end
+		ids.each do |id|
+			runner.add(id)
+		end
+
+		if runner.check_all
 			return true
 		else
 			puts
@@ -141,13 +137,14 @@ protected
 			else
 				wait(10)
 			end
-			
+
 			line
 			puts
 			puts "<banner>Installation instructions for required software</banner>"
 			puts
-			missing_dependencies.each do |dep|
-				print_dependency_installation_instructions(dep)
+			runner.missing_dependencies.each do |dep|
+				puts " * To install <yellow>#{dep.name}</yellow>:"
+				puts "   #{dep.install_instructions}"
 				puts
 			end
 			if respond_to?(:users_guide)
@@ -310,26 +307,6 @@ protected
 			return sh("curl", url, "-f", "-L", "-o", output)
 		end
 	end
-
-private
-	def print_dependency_installation_instructions(dep)
-		puts " * To install <yellow>#{dep.name}</yellow>:"
-		if dep.install_comments
-			puts "   " << dep.install_comments
-		end
-		if !dep.install_command.nil?
-			puts "   Please run <b>#{dep.install_command}</b> as root."
-		elsif !dep.install_instructions.nil?
-			puts "   " << dep.install_instructions
-		elsif !dep.website.nil?
-			puts "   Please download it from <b>#{dep.website}</b>"
-			if !dep.website_comments.nil?
-				puts "   (#{dep.website_comments})"
-			end
-		else
-			puts "   Search Google."
-		end
-	end
 end
 
 end # module PhusionPassenger

data/lib/phusion_passenger/admin_tools/memory_stats.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -87,7 +87,7 @@ class MemoryStats
 	# Phusion Passenger is not running.
 	def passenger_processes
 		@passenger_processes ||= list_processes(:match =>
-			/((^| )Passenger |(^| )Rails:|(^| )Rack:|PassengerHelperAgent|PassengerWatchdog|PassengerLoggingAgent)/)
+			/((^| )Passenger |(^| )Rails:|(^| )Rack:|PassengerHelperAgent|PassengerWatchdog|PassengerLoggingAgent|wsgi-loader.py)/)
 	end
 	
 	# Returns the sum of the memory usages of all given processes.

data/lib/phusion_passenger/admin_tools/server_instance.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -276,7 +276,7 @@ class ServerInstance
 		doc = REXML::Document.new(xml)
 		
 		groups = []
-		doc.elements.each("info/supergroups/group") do |group_xml|
+		doc.elements.each("info/supergroups/supergroup/group") do |group_xml|
 			group = Group.new(group_xml.elements["app_root"].text,
 				group_xml.elements["name"].text,
 				group_xml.elements["environment"].text,

data/lib/phusion_passenger/common_library.rb

@@ -361,6 +361,12 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
 			Utils/CachedFileStat.h
 			Utils/CachedFileStat.hpp
 		)
+	define_component 'Utils/LargeFiles.o',
+		:source   => 'Utils/LargeFiles.cpp',
+		:category => :other,
+		:deps     => %w(
+			Utils/LargeFiles.h
+		)
 	define_component 'ApplicationPool2/Implementation.o',
 		:source   => 'ApplicationPool2/Implementation.cpp',
 		:category => :other,
@@ -373,6 +379,20 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
 			ApplicationPool2/Session.h
 			ApplicationPool2/Options.h
 			ApplicationPool2/PipeWatcher.h
+			ApplicationPool2/AppTypes.h
+			ApplicationPool2/Spawner.h
+			ApplicationPool2/SpawnerFactory.h
+			ApplicationPool2/SmartSpawner.h
+			ApplicationPool2/DirectSpawner.h
+			ApplicationPool2/DummySpawner.h
+		)
+	define_component 'ApplicationPool2/AppTypes.o',
+		:source   => 'ApplicationPool2/AppTypes.cpp',
+		:category => :other,
+		:deps     => %w(
+			ApplicationPool2/AppTypes.h
+			Utils/StrIntUtils.h
+			Utils/CachedFileStat.h
 		)
 	define_component 'AccountsDatabase.o',
 		:source   => 'AccountsDatabase.cpp',
@@ -389,10 +409,10 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
 		:deps     => %w(
 			AgentsStarter.h
 			AgentsStarter.hpp
-			IniFile.h
 			ResourceLocator.h
 			MessageClient.h
 			ServerInstanceDir.h
+			Utils/IniFile.h
 			Utils/VariantMap.h
 		)
 	define_component 'AgentsBase.o',
@@ -437,5 +457,5 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
 end
 
 # Objects that must be linked into the Nginx binary.
-NGINX_LIBS_SELECTOR = [:base, 'AgentsStarter.o', 'Utils/CachedFileStat.o',
-	'Utils/Base64.o', 'agents/LoggingAgent/FilterSupport.o']
+NGINX_LIBS_SELECTOR = [:base, 'AgentsStarter.o', 'ApplicationPool2/AppTypes.o',
+	'Utils/CachedFileStat.o', 'Utils/Base64.o', 'agents/LoggingAgent/FilterSupport.o']

data/lib/phusion_passenger/debug_logging.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -98,10 +98,17 @@ module DebugLogging
 			now = Time.now
 			time_str = now.strftime("%Y-%m-%d %H:%M:%S.")
 			time_str << sprintf("%04d", now.usec / 100)
-			if thread_name = Thread.current[:name]
+
+			current_thread = Thread.current
+			if !(thread_id = current_thread[:id])
+				current_thread.to_s =~ /:(0x[0-9a-f]+)/i
+				thread_id = current_thread[:id] = $1 || '?'
+			end
+			if thread_name = current_thread[:name]
 				thread_name = "(#{thread_name})"
 			end
-			output.write("[ pid=#{$$} thr=0x#{Thread.current.object_id.to_s(16)}#{thread_name} file=#{location} time=#{time_str} ]: #{message}\n")
+
+			output.write("[ #{time_str} #{$$}/#{thread_id}#{thread_name} #{location} ]: #{message}\n")
 			output.flush
 		end
 	end

data/lib/phusion_passenger/packaging.rb

@@ -56,6 +56,7 @@ module Packaging
 		'LICENSE',
 		'INSTALL.md',
 		'NEWS',
+		'passenger.gemspec',
 		'build/*.rb',
 		'lib/*.rb',
 		'lib/**/*.rb',

data/lib/phusion_passenger/platform_info.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -28,9 +28,11 @@ module PhusionPassenger
 module PlatformInfo
 private
 	@@cache_dir = nil
-	
-	def self.cache_dir=(value)
-		@@cache_dir = value
+	@@verbose   = ['1', 'true', 'on', 'yes'].include?(ENV['VERBOSE'])
+	@@log_implementation = lambda do |message|
+		message = reindent(message, 3)
+		message.sub!(/^   /, '')
+		STDERR.puts " * #{message}"
 	end
 	
 	def self.private_class_method(name)
@@ -128,37 +130,98 @@ private
 		return nil
 	end
 	private_class_method :select_executable
-	
-	def self.read_file(filename)
-		return File.read(filename)
-	rescue
-		return ""
+
+	def self.unindent(str)
+		str = str.dup
+		str.gsub!(/\A([\s\t]*\n)+/, '')
+		str.gsub!(/[\s\t\n]+\Z/, '')
+		indent = str.split("\n").select{ |line| !line.strip.empty? }.map{ |line| line.index(/[^\s]/) }.compact.min || 0
+		str.gsub!(/^[[:blank:]]{#{indent}}/, '')
+		return str
+	end
+	private_class_method :unindent
+
+	def self.reindent(str, level)
+		str = unindent(str)
+		str.gsub!(/^/, ' ' * level)
+		return str
 	end
-	private_class_method :read_file
+	private_class_method :reindent
+
+	def self.create_temp_file(name, dir = tmpdir)
+		tag = "#{Process.pid}.#{Thread.current.object_id.to_s(16)}"
+		if name =~ /\./
+			ext = File.extname(name)
+			name = File.basename(name, ext) + "-#{tag}#{ext}"
+		else
+			name = "#{name}-#{tag}"
+		end
+		filename = "#{dir}/#{name}"
+		f = File.open(filename, "w")
+		begin
+			yield(filename, f)
+		ensure
+			f.close if !f.closed?
+			File.unlink(filename) if File.exist?(filename)
+		end
+	end
+	private_class_method :create_temp_file
+
+	def self.log(message)
+		if verbose?
+			@@log_implementation.call(message)
+		end
+	end
+	private_class_method :log
 
 public
 	class RuntimeError < ::RuntimeError
 	end
-	
-	# Check whether the specified command is in $PATH, and return its
-	# absolute filename. Returns nil if the command is not found.
-	#
-	# This function exists because system('which') doesn't always behave
-	# correctly, for some weird reason.
-	def self.find_command(name)
-		name = name.to_s
-		ENV['PATH'].to_s.split(File::PATH_SEPARATOR).detect do |directory|
-			path = File.join(directory, name)
-			if File.file?(path) && File.executable?(path)
-				return path
-			end
-		end
-		return nil
+
+
+	def self.cache_dir=(value)
+		@@cache_dir = value
 	end
-	
+
+	def self.cache_dir
+		return @@cache_dir
+	end
+
+	def self.verbose=(val)
+		@@verbose = val
+	end
+
+	def self.verbose?
+		return @@verbose
+	end
+
+	def self.log_implementation=(impl)
+		@@log_implementation = impl
+	end
+
+	def self.log_implementation
+		return @@log_implementation
+	end
+
+
 	def self.env_defined?(name)
 		return !ENV[name].nil? && !ENV[name].empty?
 	end
+
+	def self.string_env(name, default_value = nil)
+		value = ENV[name]
+		if value.nil? || value.empty?
+			return default_value
+		else
+			return value
+		end
+	end
+
+	def self.read_file(filename)
+		return File.read(filename)
+	rescue
+		return ""
+	end
 	
 	def self.tmpdir
 		result = ENV['TMPDIR']
@@ -246,94 +309,6 @@ public
 		raise RuntimeError, message
 	end
 	memoize :tmpexedir
-	
-	def self.cc
-		return ENV['CC'] || "gcc"
-	end
-	
-	def self.cxx
-		return ENV['CXX'] || "g++"
-	end
-	
-	def self.try_compile(language, source, flags = nil)
-		if language == :c
-			compiler = cc
-		elsif language == :cxx
-			compiler = cxx
-		else
-			raise ArgumentError,"Unsupported language '#{language}'"
-		end
-		filename = File.join("#{tmpexedir}/passenger-compile-check-#{Process.pid}.c")
-		File.open(filename, "w") do |f|
-			f.puts(source)
-		end
-		begin
-			return system("(#{compiler} #{flags} -c '#{filename}' -o '#{filename}.o') >/dev/null 2>/dev/null")
-		ensure
-			File.unlink(filename) rescue nil
-			File.unlink("#{filename}.o") rescue nil
-		end
-	end
-	private_class_method :try_compile
-	
-	def self.try_link(language, source, flags = nil)
-		if language == :c
-			compiler = cc
-		elsif language == :cxx
-			compiler = cxx
-		else
-			raise ArgumentError,"Unsupported language '#{language}'"
-		end
-		filename = File.join("#{tmpexedir}/passenger-link-check-#{Process.pid}.c")
-		File.open(filename, "w") do |f|
-			f.puts(source)
-		end
-		begin
-			return system("(#{compiler} #{flags} '#{filename}' -o '#{filename}.out') >/dev/null 2>/dev/null")
-		ensure
-			File.unlink(filename) rescue nil
-			File.unlink("#{filename}.out") rescue nil
-		end
-	end
-	private_class_method :try_link
-	
-	def self.try_compile_and_run(language, source, flags = nil)
-		if language == :c
-			compiler = cc
-		elsif language == :cxx
-			compiler = cxx
-		else
-			raise ArgumentError,"Unsupported language '#{language}'"
-		end
-		filename = File.join("#{tmpexedir}/passenger-compile-check-#{Process.pid}.c")
-		File.open(filename, "w") do |f|
-			f.puts(source)
-		end
-		begin
-			if system("(#{compiler} #{flags} '#{filename}' -o '#{filename}.out') >/dev/null 2>/dev/null")
-				if Process.respond_to?(:spawn)
-					pid = Process.spawn("#{filename}.out",
-						:out => ["/dev/null", "w"],
-						:err => ["/dev/null", "w"])
-					
-				else
-					pid = fork do
-						STDOUT.reopen("/dev/null", "w")
-						STDERR.reopen("/dev/null", "w")
-						exec("#{filename}.out")
-					end
-				end
-				pid = Process.waitpid(pid) rescue nil
-				return pid && $?.exitstatus == 0
-			else
-				return false
-			end
-		ensure
-			File.unlink(filename) rescue nil
-			File.unlink("#{filename}.out") rescue nil
-		end
-	end
-	private_class_method :try_compile_and_run
 
 	def self.rb_config
 		if defined?(::RbConfig)
@@ -342,7 +317,30 @@ public
 			return ::Config::CONFIG
 		end
 	end
-	private_class_method :rb_config
+
+	# Check whether the specified command is in $PATH, and return its
+	# absolute filename. Returns nil if the command is not found.
+	#
+	# This function exists because system('which') doesn't always behave
+	# correctly, for some weird reason.
+	def self.find_command(name)
+		name = name.to_s
+		if name =~ /^\//
+			if File.executable?(name)
+				return name
+			else
+				return nil
+			end
+		else
+			ENV['PATH'].to_s.split(File::PATH_SEPARATOR).detect do |directory|
+				path = File.join(directory, name)
+				if File.file?(path) && File.executable?(path)
+					return path
+				end
+			end
+			return nil
+		end
+	end
 end
 
 end # module PhusionPassenger