passenger 3.0.21 → 3.9.1.beta

data/lib/phusion_passenger/message_channel.rb

@@ -24,53 +24,9 @@
 
 module PhusionPassenger
 
-# This class provides convenience methods for:
-# - sending and receiving raw data over an IO channel.
-# - sending and receiving messages over an IO channel.
-# - file descriptor (IO object) passing over a Unix socket.
-# All of these methods use exceptions for error reporting.
-#
-# There are two kinds of messages:
-# [ Array messages ]
-#   These are just a list of strings, and the message
-#   itself has a specific length. The contained strings may not
-#   contain NUL characters (<tt>'\\0'</tt>). Note that an array message
-#   must have at least one element.
-# [ Scalar messages ]
-#   These are byte strings which may contain arbitrary
-#   binary data. Scalar messages also have a specific length.
-#
-# The protocol is designed to be low overhead, easy to implement and
-# easy to parse.
-#
-# MessageChannel is to be wrapped around an IO object. For example:
-#
-#  a, b = IO.pipe
-#  channel1 = MessageChannel.new(a)
-#  channel2 = MessageChannel.new(b)
-#  
-#  # Send an array message.
-#  channel2.write("hello", "world !!")
-#  channel1.read    # => ["hello", "world !!"]
-#  
-#  # Send a scalar message.
-#  channel2.write_scalar("some long string which can contain arbitrary binary data")
-#  channel1.read_scalar
-#
-# The life time of a MessageChannel is independent from that of the
-# wrapped IO object. If a MessageChannel object is destroyed,
-# the underlying IO object is not automatically closed. Call close()
-# if you want to close the underlying IO object.
-#
-# Note:
-# Be careful with mixing the sending/receiving of array messages,
-# scalar messages and IO objects. If you send a collection of any
-# of these in a specific order, then the receiving side must receive them
-# in the exact some order. So suppose you first send a message, then an
-# IO object, then a scalar, then the receiving side must first
-# receive a message, then an IO object, then a scalar. If the
-# receiving side does things in the wrong order then bad things will
-# happen.
+# This class allows reading and writing structured messages over
+# I/O channels. This is the Ruby implementation of ext/common/Utils/MessageIO.h;
+# see that file for more information.
 class MessageChannel
 	HEADER_SIZE = 2                  # :nodoc:
 	DELIMITER = "\0"                 # :nodoc:

data/lib/phusion_passenger/message_client.rb

@@ -87,8 +87,8 @@ class MessageClient
 		end
 	end
 	
-	def status
-		write("inspect")
+	def status(options = {})
+		write("inspect", *options.to_a.flatten)
 		check_security_response
 		return read_scalar
 	rescue

data/lib/phusion_passenger/native_support.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010, 2011, 2012 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -30,9 +30,9 @@ class NativeSupportLoader
 	
 	def start
 		require 'phusion_passenger'
-		load_from_source_dir ||
+		load_from_source_root ||
 		load_from_load_path ||
-		load_from_home ||
+		load_from_home_dir ||
 		compile_and_load
 	end
 
@@ -40,7 +40,7 @@ private
 	def archdir
 		@archdir ||= begin
 			require 'phusion_passenger/platform_info/binary_compatibility'
-			PlatformInfo.ruby_extension_binary_compatibility_ids.join("-")
+			PlatformInfo.ruby_extension_binary_compatibility_id
 		end
 	end
 	
@@ -63,13 +63,22 @@ private
 	end
 	
 	def extconf_rb
-		File.join(SOURCE_ROOT, "ext", "ruby", "extconf.rb")
+		File.join(PhusionPassenger.ruby_extension_source_dir, "extconf.rb")
 	end
 	
-	def load_from_source_dir
-		if defined?(NATIVE_SUPPORT_DIR)
+	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")
+		else
+			return nil
+		end
+	end
+	
+	def load_from_source_root
+		if PhusionPassenger.originally_packaged?
 			begin
-				require "#{NATIVE_SUPPORT_DIR}/#{archdir}/#{library_name}"
+				require "#{native_support_dir_in_source_root}/#{archdir}/#{library_name}"
 				return true
 			rescue LoadError
 				return false
@@ -86,9 +95,9 @@ private
 		return false
 	end
 	
-	def load_from_home
+	def load_from_home_dir
 		begin
-			require "#{home}/#{LOCAL_DIR}/native_support/#{VERSION_STRING}/#{archdir}/#{library_name}"
+			require "#{home}/#{USER_NAMESPACE_DIRNAME}/native_support/#{VERSION_STRING}/#{archdir}/#{library_name}"
 			return true
 		rescue LoadError
 			return false
@@ -98,15 +107,15 @@ private
 	def compile_and_load
 		STDERR.puts "*** Phusion Passenger: no #{library_name} found for " +
 			"the current Ruby interpreter. Compiling one..."
-		
+
 		require 'fileutils'
 		require 'phusion_passenger/platform_info/ruby'
 		
 		target_dirs = []
-		if defined?(NATIVE_SUPPORT_DIR)
-			target_dirs << "#{NATIVE_SUPPORT_DIR}/#{archdir}"
+		if native_support_dir_in_source_root
+			target_dirs << "#{native_support_dir_in_source_root}/#{archdir}"
 		end
-		target_dirs << "#{home}/#{LOCAL_DIR}/native_support/#{VERSION_STRING}/#{archdir}"
+		target_dirs << "#{home}/#{USER_NAMESPACE_DIRNAME}/native_support/#{VERSION_STRING}/#{archdir}"
 		
 		target_dir = compile(target_dirs)
 		require "#{target_dir}/#{library_name}"
@@ -124,7 +133,7 @@ private
 		command_string = args.join(' ')
 		STDERR.puts "# #{command_string}"
 		if !system(*args)
-			raise "Could not compile #{library_name} ('#{command_string}' failed)"
+			raise "Could not compile #{library_name} (\"#{command_string}\" failed)"
 		end
 	end
 	
@@ -154,6 +163,18 @@ private
 						"trying a different directory..."
 					STDERR.puts "-------------------------------"
 				end
+			rescue Errno::ENOTDIR
+				# This can occur when PhusionPassenger.source_root
+				# is a location configuration file, and natively_packaged
+				# is set to false. For example, when we're running
+				# in Phusion Passenger Standalone. In this case
+				# just ignore this directory.
+				if i == target_dirs.size - 1
+					raise
+				else
+					STDERR.puts "Not a valid directory. Trying a different one..."
+					STDERR.puts "-------------------------------"
+				end
 			end
 		end
 		return result

data/lib/phusion_passenger/packaging.rb

@@ -52,7 +52,6 @@ module Packaging
 		'Rakefile',
 		'README',
 		'DEVELOPERS.TXT',
-		'PACKAGING.TXT',
 		'LICENSE',
 		'INSTALL',
 		'NEWS',
@@ -60,36 +59,34 @@ module Packaging
 		'lib/*.rb',
 		'lib/**/*.rb',
 		'lib/**/*.py',
-		'lib/phusion_passenger/templates/*',
-		'lib/phusion_passenger/templates/apache2/*',
-		'lib/phusion_passenger/templates/nginx/*',
-		'lib/phusion_passenger/templates/standalone/*',
-		'lib/phusion_passenger/templates/standalone_default_root/*',
 		'bin/*',
 		'doc/**/*',
 		'man/*',
 		'debian/*',
 		'helper-scripts/*',
-		'ext/common/**/*.{cpp,c,h,hpp}',
+		'ext/common/**/*.{cpp,c,h,hpp,md}',
 		'ext/apache2/*.{cpp,h,hpp,c}',
 		'ext/nginx/*.{c,cpp,h}',
 		'ext/nginx/config',
 		'ext/boost/**/*',
-		'ext/google/**/*',
 		'ext/libev/{LICENSE,Changes,README,Makefile.am,Makefile.in}',
 		'ext/libev/{*.m4,autogen.sh,config.guess,config.h.in,config.sub}',
-		'ext/libev/{configure,configure.ac,install-sh,ltmain.sh,missing,mkinstalldirs}',
+		'ext/libev/{configure,configure.ac,depcomp,install-sh,ltmain.sh,missing,mkinstalldirs}',
 		'ext/libev/{*.h,*.c}',
+		'ext/libeio/{LICENSE,Changes,README,Makefile.am,Makefile.in}',
+		'ext/libeio/{*.m4,autogen.sh,config.guess,config.h.in,config.sub}',
+		'ext/libeio/{configure,configure.ac,install-sh,ltmain.sh,missing,mkinstalldirs}',
+		'ext/libeio/{*.h,*.c}',
 		'ext/oxt/*.hpp',
 		'ext/oxt/*.cpp',
 		'ext/oxt/detail/*.hpp',
 		'ext/ruby/*.{c,rb}',
 		'dev/*',
-		'resources/*',
+		'resources/**/*',
 		'test/*.example',
 		'test/support/*.{c,cpp,h,rb}',
 		'test/tut/*',
-		'test/cxx/*.{cpp,h}',
+		'test/cxx/**/*.{cpp,h}',
 		'test/oxt/*.{cpp,hpp}',
 		'test/ruby/**/*',
 		'test/integration_tests/**/*',

data/lib/phusion_passenger/platform_info.rb

@@ -21,8 +21,6 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'tmpdir'
-
 module PhusionPassenger
 
 # This module autodetects various platform-specific information, and
@@ -265,12 +263,15 @@ public
 		else
 			raise ArgumentError,"Unsupported language '#{language}'"
 		end
-		Dir.mktmpdir("passenger.", tmpexedir) do |dir|
-			filename = File.join(dir, "check.c")
-			File.open(filename, "w") do |f|
-				f.puts(source)
-			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
@@ -283,12 +284,15 @@ public
 		else
 			raise ArgumentError,"Unsupported language '#{language}'"
 		end
-		Dir.mktmpdir("passenger.", tmpexedir) do |dir|
-			filename = File.join(dir, "check.c")
-			File.open(filename, "w") do |f|
-				f.puts(source)
-			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
@@ -301,16 +305,17 @@ public
 		else
 			raise ArgumentError,"Unsupported language '#{language}'"
 		end
-		Dir.mktmpdir("passenger.", tmpexedir) do |dir|
-			filename = File.join(dir, "check.c")
-			File.open(filename, "w") do |f|
-				f.puts(source)
-			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")
@@ -323,6 +328,9 @@ public
 			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

data/lib/phusion_passenger/platform_info/apache.rb

@@ -174,12 +174,6 @@ module PlatformInfo
 	# Also includes APR and APU compiler flags if with_apr_flags is true.
 	def self.apache2_module_cflags(with_apr_flags = true)
 		flags = ["-fPIC"]
-		if compiler_supports_visibility_flag?
-			flags << "-fvisibility=hidden -DVISIBILITY_ATTRIBUTE_SUPPORTED"
-			if compiler_visibility_flag_generates_warnings? && compiler_supports_wno_attributes_flag?
-				flags << "-Wno-attributes"
-			end
-		end
 		if with_apr_flags
 			flags << apr_flags
 			flags << apu_flags
@@ -285,7 +279,16 @@ module PlatformInfo
 	# headers are placed into the same directory as the Apache headers,
 	# and so 'apr-config' and 'apu-config' won't be necessary in that case.
 	def self.apr_config_needed_for_building_apache_modules?
-		return !try_compile(:c, "#include <apr.h>", apache2_module_cflags(false))
+		filename = File.join("#{tmpexedir}/passenger-platform-check-#{Process.pid}.c")
+		File.open(filename, "w") do |f|
+			f.puts("#include <apr.h>")
+		end
+		begin
+			return !system("(gcc #{apache2_module_cflags(false)} -c '#{filename}' -o '#{filename}.o') >/dev/null 2>/dev/null")
+		ensure
+			File.unlink(filename) rescue nil
+			File.unlink("#{filename}.o") rescue nil
+		end
 	end
 	memoize :apr_config_needed_for_building_apache_modules?
 

data/lib/phusion_passenger/platform_info/binary_compatibility.rb

@@ -56,7 +56,7 @@ module PlatformInfo
 	#   because extensions must be able to support all of the Ruby
 	#   executable's architectures.
 	# - The operating system for which the Ruby interpreter was compiled.
-	def self.ruby_extension_binary_compatibility_ids
+	def self.ruby_extension_binary_compatibility_id
 		ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
 		ruby_ext_version = RUBY_VERSION
 		if RUBY_PLATFORM =~ /darwin/
@@ -73,23 +73,21 @@ module PlatformInfo
 		else
 			ruby_arch = cpu_architectures[0]
 		end
-		return [ruby_engine, ruby_ext_version, ruby_arch, os_name]
+		return "#{ruby_engine}-#{ruby_ext_version}-#{ruby_arch}-#{os_name}"
 	end
-	memoize :ruby_extension_binary_compatibility_ids
+	memoize :ruby_extension_binary_compatibility_id
 	
 	# Returns an identifier string that describes the current
-	# platform's binary compatibility with regard to Phusion Passenger
-	# binaries, both the Ruby extension and the C++ binaries. Two
-	# systems with the same binary compatibility identifiers
-	# are able to run the same Phusion Passenger binaries.
+	# platform's binary compatibility with regard to C/C++
+	# binaries. Two systems with the same binary compatibility
+	# identifiers are able to run the same C/C++ binaries.
 	#
 	# The the string depends on the following factors:
-	# - The Ruby extension binary compatibility identifiers.
 	# - The operating system name.
 	# - Operating system runtime identifier.
 	#   This may include the kernel version, libc version, C++ ABI version,
 	#   etc. Everything that is of interest for binary compatibility with
-	#   Phusion Passenger's C++ components.
+	#   regard to C/C++ binaries.
 	# - Operating system default runtime architecture.
 	#   This is not the same as the CPU architecture; some CPUs support
 	#   multiple architectures, e.g. Intel Core 2 Duo supports x86 and
@@ -100,10 +98,7 @@ module PlatformInfo
 	#   This component identifies the architecture that is used when
 	#   compiling a binary with the system's C++ compiler with its default
 	#   options.
-	def self.passenger_binary_compatibility_id
-		ruby_engine, ruby_ext_version, ruby_arch, os_name =
-			ruby_extension_binary_compatibility_ids
-		
+	def self.cxx_binary_compatibility_id
 		if os_name == "macosx"
 			# RUBY_PLATFORM gives us the kernel version, but we want
 			# the OS X version.
@@ -152,24 +147,9 @@ module PlatformInfo
 			end
 		end
 		
-		if ruby_engine == "jruby"
-			# For JRuby it's kinda useless to prepend "java" as extension
-			# architecture because JRuby doesn't allow any other extension
-			# architecture.
-			identifier = ""
-		else
-			identifier = "#{ruby_arch}-"
-		end
-		identifier << "#{ruby_engine}#{ruby_ext_version}-"
-		# If the extension architecture is the same as the OS architecture
-		# then there's no need to specify it twice.
-		if ruby_arch != os_arch
-			identifier << "#{os_arch}-"
-		end
-		identifier << "#{os_name}-#{os_runtime}"
-		return identifier
+		return "#{os_arch}-#{os_name}-#{os_runtime}"
 	end
-	memoize :passenger_binary_compatibility_id
+	memoize :cxx_binary_compatibility_id
 end
 
 end # module PhusionPassenger

data/lib/phusion_passenger/platform_info/compiler.rb

@@ -46,6 +46,16 @@ module PlatformInfo
 	end
 	memoize :gnu_make, true
 	
+	def self.cc_is_clang?
+		`#{cc} --version 2>&1` =~ /clang version/
+	end
+	memoize :cc_is_clang?
+
+	def self.cxx_is_clang?
+		`#{cxx} --version 2>&1` =~ /clang version/
+	end
+	memoize :cxx_is_clang?
+
 	# Checks whether the compiler supports "-arch #{arch}".
 	def self.compiler_supports_architecture?(arch)
 		return try_compile(:c, '', "-arch #{arch}")
@@ -61,7 +71,7 @@ module PlatformInfo
 		return try_compile(:c, '', '-Wno-attributes')
 	end
 	memoize :compiler_supports_wno_attributes_flag?, true
-	
+
 	def self.compiler_supports_wno_missing_field_initializers_flag?
 		return try_compile(:c, '', '-Wno-missing-field-initializers')
 	end
@@ -103,43 +113,57 @@ module PlatformInfo
 	def self.portability_cflags
 		flags = ["-D_REENTRANT -I/usr/local/include"]
 		
-		# Google SparseHash flags.
-		# Figure out header for hash function object and its namespace.
-		# Based on stl_hash.m4 and stl_hash_fun.m4 in the Google SparseHash sources.
-		hash_namespace = nil
-		ok = false
-		['__gnu_cxx', '', 'std', 'stdext'].each do |namespace|
-			['ext/hash_map', 'hash_map'].each do |hash_map_header|
+		# There are too many implementations of of the hash map!
+		# Figure out the right one.
+		ok = try_compile(:cxx, %Q{
+			#include <tr1/unordered_map>
+			int
+			main() {
+				std::tr1::unordered_map<int, int> m;
+				return 0;
+			}
+		})
+		if ok
+			flags << "-DHAS_TR1_UNORDERED_MAP"
+		else
+			hash_namespace = nil
+			ok = false
+			['__gnu_cxx', '', 'std', 'stdext'].each do |namespace|
+				['hash_map', 'ext/hash_map'].each do |hash_map_header|
+					ok = try_compile(:cxx, %Q{
+						#include <#{hash_map_header}>
+						int
+						main() {
+							#{namespace}::hash_map<int, int> m;
+							return 0;
+						}
+					})
+					if ok
+						hash_namespace = namespace
+						flags << "-DHASH_NAMESPACE=\"#{namespace}\""
+						flags << "-DHASH_MAP_HEADER=\"<#{hash_map_header}>\""
+						flags << "-DHASH_MAP_CLASS=\"hash_map\""
+					end
+					break if ok
+				end
+				break if ok
+			end
+			['ext/hash_fun.h', 'functional', 'tr1/functional',
+			 'ext/stl_hash_fun.h', 'hash_fun.h', 'stl_hash_fun.h',
+			 'stl/_hash_fun.h'].each do |hash_function_header|
 				ok = try_compile(:cxx, %Q{
-					#include <#{hash_map_header}>
+					#include <#{hash_function_header}>
 					int
 					main() {
-						#{namespace}::hash_map<int, int> m;
+						#{hash_namespace}::hash<int>()(5);
 						return 0;
 					}
 				})
 				if ok
-					hash_namespace = namespace
-					flags << "-DHASH_NAMESPACE=\"#{namespace}\""
+					flags << "-DHASH_FUN_H=\"<#{hash_function_header}>\""
+					break
 				end
 			end
-			break if ok
-		end
-		['ext/hash_fun.h', 'functional', 'tr1/functional',
-		 'ext/stl_hash_fun.h', 'hash_fun.h', 'stl_hash_fun.h',
-		 'stl/_hash_fun.h'].each do |hash_function_header|
-			ok = try_compile(:cxx, %Q{
-				#include <#{hash_function_header}>
-				int
-				main() {
-					#{hash_namespace}::hash<int>()(5);
-					return 0;
-				}
-			})
-			if ok
-				flags << "-DHASH_FUN_H=\"<#{hash_function_header}>\""
-				break
-			end
 		end
 		
 		if RUBY_PLATFORM =~ /solaris/
@@ -189,15 +213,50 @@ module PlatformInfo
 	
 	# C compiler flags that should be passed in order to enable debugging information.
 	def self.debugging_cflags
-		if RUBY_PLATFORM =~ /openbsd/
-			# According to OpenBSD's pthreads man page, pthreads do not work
-			# correctly when an app is compiled with -g. It recommends using
-			# -ggdb instead.
+		# According to OpenBSD's pthreads man page, pthreads do not work
+		# correctly when an app is compiled with -g. It recommends using
+		# -ggdb instead.
+		#
+		# In any case we'll always want to use -ggdb for better GDB debugging.
+		if cc_is_clang? || cxx_is_clang?
+			return '-g'
+		else
 			return '-ggdb'
+		end
+	end
+
+	def self.dmalloc_ldflags
+		if !ENV['DMALLOC_LIBS'].to_s.empty?
+			return ENV['DMALLOC_LIBS']
+		end
+		if RUBY_PLATFORM =~ /darwin/
+			['/opt/local', '/usr/local', '/usr'].each do |prefix|
+				filename = "#{prefix}/lib/libdmallocthcxx.a"
+				if File.exist?(filename)
+					return filename
+				end
+			end
+			return nil
 		else
-			return '-g'
+			return "-ldmallocthcxx"
+		end
+	end
+	memoize :dmalloc_ldflags
+
+	def self.electric_fence_ldflags
+		if RUBY_PLATFORM =~ /darwin/
+			['/opt/local', '/usr/local', '/usr'].each do |prefix|
+				filename = "#{prefix}/lib/libefence.a"
+				if File.exist?(filename)
+					return filename
+				end
+			end
+			return nil
+		else
+			return "-lefence"
 		end
 	end
+	memoize :electric_fence_ldflags
 	
 	def self.export_dynamic_flags
 		if RUBY_PLATFORM =~ /linux/