passenger 2.0.6 → 2.1.2

data/lib/{passenger → phusion_passenger}/console_text_template.rb

@@ -17,7 +17,7 @@
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 require 'erb'
-module Passenger
+module PhusionPassenger
 
 class ConsoleTextTemplate
 	TEMPLATE_DIR = "#{File.dirname(__FILE__)}/templates"
@@ -58,4 +58,4 @@ private
 	end
 end
 
-end # module Passenger
+end # module PhusionPassenger

data/{ext/passenger/extconf.rb → lib/phusion_passenger/constants.rb}

@@ -1,8 +1,6 @@
 #  Phusion Passenger - http://www.modrails.com/
 #  Copyright (C) 2008  Phusion
 #
-#  Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.
-#
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation; version 2 of the License.
@@ -15,6 +13,8 @@
 #  You should have received a copy of the GNU General Public License along
 #  with this program; if not, write to the Free Software Foundation, Inc.,
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-require 'mkmf'
-$LIBS=""
-create_makefile('native_support')
+
+module PhusionPassenger
+	DEFAULT_FRAMEWORK_SPAWNER_MAX_IDLE_TIME = 30 * 60
+	DEFAULT_APP_SPAWNER_MAX_IDLE_TIME       = 10 * 60
+end

data/lib/{passenger → phusion_passenger}/dependencies.rb

@@ -16,8 +16,8 @@
 #  with this program; if not, write to the Free Software Foundation, Inc.,
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require 'passenger/platform_info'
-module Passenger
+require 'phusion_passenger/platform_info'
+module PhusionPassenger
 
 # Represents a dependency software that Passenger requires. It's used by the
 # installer to check whether all dependencies are available. A Dependency object
@@ -53,11 +53,11 @@ class Dependency # :nodoc: all
 
 private
 	class Result
-		def found(filename_or_boolean = nil)
-			if filename_or_boolean.nil?
+		def found(*args)
+			if args.empty?
 				@found = true
 			else
-				@found = filename_or_boolean
+				@found = args.first
 			end
 		end
 		
@@ -90,8 +90,12 @@ end
 # Namespace which contains the different dependencies that Passenger may require.
 # See Dependency for more information.
 module Dependencies # :nodoc: all
-	include PlatformInfo
-	
+	# Returns whether fastthread is a required dependency for the current
+	# Ruby interpreter.
+	def self.fastthread_required?
+		return (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby") && RUBY_VERSION < "1.8.7"
+	end
+
 	GCC = Dependency.new do |dep|
 		dep.name = "GNU C++ compiler"
 		dep.define_checker do |result|
@@ -103,7 +107,7 @@ module Dependencies # :nodoc: all
 			end
 		end
 		if RUBY_PLATFORM =~ /linux/
-			case LINUX_DISTRO
+			case PlatformInfo.linux_distro
 			when :ubuntu, :debian
 				dep.install_command = "apt-get install build-essential"
 			when :rhel, :fedora, :centos
@@ -123,13 +127,14 @@ module Dependencies # :nodoc: all
 			require 'rbconfig'
 			begin
 				require 'mkmf'
-				result.found(File.exist?(Config::CONFIG['archdir'] + "/ruby.h"))
+				header_dir = Config::CONFIG['rubyhdrdir'] || Config::CONFIG['archdir']
+				result.found(File.exist?("#{header_dir}/ruby.h"))
 			rescue LoadError
 				result.not_found
 			end
 		end
 		if RUBY_PLATFORM =~ /linux/
-			case LINUX_DISTRO
+			case PlatformInfo.linux_distro
 			when :ubuntu, :debian
 				dep.install_command = "apt-get install ruby1.8-dev"
 			when :rhel, :fedora, :centos
@@ -155,7 +160,7 @@ module Dependencies # :nodoc: all
 			end
 		end
 		if RUBY_PLATFORM =~ /linux/
-			case LINUX_DISTRO
+			case PlatformInfo.linux_distro
 			when :ubuntu, :debian
 				dep.install_command = "apt-get install libopenssl-ruby"
 			end
@@ -185,17 +190,10 @@ module Dependencies # :nodoc: all
 	Rake = Dependency.new do |dep|
 		dep.name = "Rake"
 		dep.define_checker do |result|
-			bindir = File.dirname(PlatformInfo::RUBY)
-			rake = File.join(bindir, "rake")
-			if File.executable?(rake)
-				result.found(rake)
+			if PlatformInfo.rake.nil?
+				result.not_found
 			else
-				rake = PlatformInfo.find_command("rake")
-				if rake.nil?
-					result.not_found
-				else
-					result.found(rake)
-				end
+				result.found(PlatformInfo.rake)
 			end
 		end
 		dep.website = "http://rake.rubyforge.org/"
@@ -205,14 +203,14 @@ module Dependencies # :nodoc: all
 	Apache2 = Dependency.new do |dep|
 		dep.name = "Apache 2"
 		dep.define_checker do |result|
-			if HTTPD.nil?
+			if PlatformInfo.httpd.nil?
 				result.not_found
 			else
-				result.found(HTTPD)
+				result.found(PlatformInfo.httpd)
 			end
 		end
 		if RUBY_PLATFORM =~ /linux/
-			case LINUX_DISTRO
+			case PlatformInfo.linux_distro
 			when :ubuntu, :debian
 				dep.install_command = "apt-get install apache2-mpm-prefork"
 			when :rhel, :fedora, :centos
@@ -230,14 +228,14 @@ module Dependencies # :nodoc: all
 	Apache2_DevHeaders = Dependency.new do |dep|
 		dep.name = "Apache 2 development headers"
 		dep.define_checker do |result|
-			if APXS2.nil?
+			if PlatformInfo.apxs2.nil?
 				result.not_found
 			else
-				result.found(APXS2)
+				result.found(PlatformInfo.apxs2)
 			end
 		end
 		if RUBY_PLATFORM =~ /linux/
-			case LINUX_DISTRO
+			case PlatformInfo.linux_distro
 			when :ubuntu, :debian
 				dep.install_command = "apt-get install apache2-prefork-dev"
 				dep.provides = [Apache2]
@@ -257,10 +255,14 @@ module Dependencies # :nodoc: all
 	APR_DevHeaders = Dependency.new do |dep|
 		dep.name = "Apache Portable Runtime (APR) development headers"
 		dep.define_checker do |result|
-			result.found(APR_CONFIG)
+			if PlatformInfo.apr_config.nil?
+				result.not_found
+			else
+				result.found(PlatformInfo.apr_config)
+			end
 		end
 		if RUBY_PLATFORM =~ /linux/
-			case LINUX_DISTRO
+			case PlatformInfo.linux_distro
 			when :ubuntu, :debian
 				dep.install_command = "apt-get install libapr1-dev"
 			when :rhel, :fedora, :centos
@@ -278,9 +280,13 @@ module Dependencies # :nodoc: all
 	end
 
 	APU_DevHeaders = Dependency.new do |dep|
-		dep.name = "Apache Portable Runtime Utility (APR) development headers"
+		dep.name = "Apache Portable Runtime Utility (APU) development headers"
 		dep.define_checker do |result|
-			result.found(APU_CONFIG)
+			if PlatformInfo.apu_config.nil?
+				result.not_found
+			else
+				result.found(PlatformInfo.apu_config)
+			end
 		end
 		dep.website = "http://httpd.apache.org/"
 		dep.website_comments = "APR Utility is an integrated part of Apache."
@@ -321,4 +327,4 @@ module Dependencies # :nodoc: all
 	end
 end
 
-end # module Passenger
+end # module PhusionPassenger

data/lib/phusion_passenger/events.rb

@@ -0,0 +1,45 @@
+#  Phusion Passenger - http://www.modrails.com/
+#  Copyright (C) 2009  Phusion
+#
+#  Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; version 2 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+module PhusionPassenger
+	@@event_starting_worker_process = []
+	@@event_stopping_worker_process = []
+	
+	def self.on_event(name, &block)
+		callback_list_for_event(name) << block
+	end
+	
+	def self.call_event(name, *args)
+		callback_list_for_event(name).each do |callback|
+			callback.call(*args)
+		end
+	end
+
+private
+	def self.callback_list_for_event(name)
+		return case name
+		when :starting_worker_process
+			@@event_starting_worker_process
+		when :stopping_worker_process
+			@@event_stopping_worker_process
+		else
+			raise ArgumentError, "Unknown event name '#{name}'"
+		end
+	end
+
+end # module PhusionPassenger

data/lib/{passenger → phusion_passenger}/exceptions.rb

@@ -16,7 +16,7 @@
 #  with this program; if not, write to the Free Software Foundation, Inc.,
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-module Passenger
+module PhusionPassenger
 
 # Indicates that there is no Ruby on Rails version installed that satisfies
 # a given Ruby on Rails Gem version specification.
@@ -50,14 +50,18 @@ end
 # Railz::FrameworkSpawner or SpawnManager was unable to spawn an application,
 # because the application either threw an exception or called exit.
 #
-# If the +child_exception+ attribute is nil, then it means that the application
-# called exit.
+# If the application called exit, then +child_exception+ is an instance of
+# +SystemExit+.
 class AppInitError < InitializationError
+	# The application type, e.g. "rails" or "rack".
 	attr_accessor :app_type
+	# Any messages printed to stderr before the failure. May be nil.
+	attr_accessor :stderr
 	
-	def initialize(message, child_exception = nil, app_type = "rails")
+	def initialize(message, child_exception = nil, app_type = "rails", stderr = nil)
 		super(message, child_exception)
 		@app_type = app_type
+		@stderr = stderr
 	end
 end
 
@@ -88,4 +92,7 @@ class UnknownError < StandardError
 	end
 end
 
-end # module Passenger
+class InvalidPath < StandardError
+end
+
+end # module PhusionPassenger

data/lib/{passenger → phusion_passenger}/html_template.rb

@@ -18,7 +18,7 @@
 
 require 'erb'
 
-module Passenger
+module PhusionPassenger
 
 # A convenience utility class for rendering our error pages.
 class HTMLTemplate
@@ -101,4 +101,4 @@ private
 	end
 end
 
-end # module Passenger
+end # module PhusionPassenger

data/lib/{passenger → phusion_passenger}/message_channel.rb

@@ -16,7 +16,7 @@
 #  with this program; if not, write to the Free Software Foundation, Inc.,
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-module Passenger
+module PhusionPassenger
 
 # This class provides convenience methods for:
 # - sending and receiving raw data over an IO channel.
@@ -140,6 +140,7 @@ class MessageChannel
 			end
 			buffer = ''
 			while buffer.size < size
+				temp = '' # JRuby doesn't clear the buffer. TODO: remove this when JRuby has been fixed.
 				buffer << @io.readpartial(size - buffer.size, temp)
 			end
 			return buffer
@@ -219,4 +220,4 @@ private
 	end
 end
 
-end # module Passenger
+end # module PhusionPassenger

data/lib/phusion_passenger/platform_info.rb

@@ -0,0 +1,500 @@
+#  Phusion Passenger - http://www.modrails.com/
+#  Copyright (C) 2008, 2009  Phusion
+#
+#  Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; version 2 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+require 'rbconfig'
+
+# Wow, I can't believe in how many ways one can build Apache in OS
+# X! We have to resort to all sorts of tricks to make Passenger build
+# out of the box on OS X. :-(
+#
+# In the name of usability and the "end user is the king" line of thought,
+# I shall suffer the horrible faith of writing tons of autodetection code!
+
+# This module autodetects various platform-specific information, and
+# provides that information through constants.
+#
+# Users can change the detection behavior by setting the environment variable
+# <tt>APXS2</tt> to the correct 'apxs' (or 'apxs2') binary, as provided by
+# Apache.
+module PlatformInfo
+private
+	# Turn the specified class method into a memoized one. If the given
+	# class method is called without arguments, then its result will be
+	# memoized, frozen, and returned upon subsequent calls without arguments.
+	# Calls with arguments are never memoized.
+	#
+	#   def self.foo(max = 10)
+	#      return rand(max)
+	#   end
+	#   memoize :foo
+	#   
+	#   foo   # => 3
+	#   foo   # => 3
+	#   foo(100)   # => 49
+	#   foo(100)   # => 26
+	#   foo   # => 3
+	def self.memoize(method)
+		metaclass = class << self; self; end
+		metaclass.send(:alias_method, "_unmemoized_#{method}", method)
+		variable_name = "@@memoized_#{method}".sub(/\?/, '')
+		check_variable_name = "@@has_memoized_#{method}".sub(/\?/, '')
+		eval("#{variable_name} = nil")
+		eval("#{check_variable_name} = false")
+		source = %Q{
+		   def self.#{method}(*args)                                # def self.httpd(*args)
+		      if args.empty?                                        #    if args.empty?
+		         if !#{check_variable_name}                         #       if !@@has_memoized_httpd
+		            #{variable_name} = _unmemoized_#{method}.freeze #          @@memoized_httpd = _unmemoized_httpd.freeze
+		            #{check_variable_name} = true                   #          @@has_memoized_httpd = true
+		         end                                                #       end
+		         return #{variable_name}                            #       return @@memoized_httpd
+		      else                                                  #    else
+		         return _unmemoized_#{method}(*args)                #       return _unmemoized_httpd(*args)
+		      end                                                   #    end
+		   end                                                      # end
+		}
+		class_eval(source)
+	end
+	
+	def self.env_defined?(name)
+		return !ENV[name].nil? && !ENV[name].empty?
+	end
+	
+	def self.locate_ruby_executable(name)
+		if RUBY_PLATFORM =~ /darwin/ &&
+		   RUBY =~ %r(\A/System/Library/Frameworks/Ruby.framework/Versions/.*?/usr/bin/ruby\Z)
+			# On OS X we must look for Ruby binaries in /usr/bin.
+			# RubyGems puts executables (e.g. 'rake') in there, not in
+			# /System/Libraries/(...)/bin.
+			filename = "/usr/bin/#{name}"
+		else
+			filename = File.dirname(RUBY) + "/#{name}"
+		end
+		if File.file?(filename) && File.executable?(filename)
+			return filename
+		else
+			# RubyGems might put binaries in a directory other
+			# than Ruby's bindir. Debian packaged RubyGems and
+			# DebGem packaged RubyGems are the prime examples.
+			begin
+				require 'rubygems' unless defined?(Gem)
+				filename = Gem.bindir + "/#{name}"
+				if File.file?(filename) && File.executable?(filename)
+					return filename
+				else
+					return nil
+				end
+			rescue LoadError
+				return nil
+			end
+		end
+	end
+	
+	# Look in the directory +dir+ and check whether there's an executable
+	# whose base name is equal to one of the elements in +possible_names+.
+	# If so, returns the full filename. If not, returns nil.
+	def self.select_executable(dir, *possible_names)
+		possible_names.each do |name|
+			filename = "#{dir}/#{name}"
+			if File.file?(filename) && File.executable?(filename)
+				return filename
+			end
+		end
+		return nil
+	end
+
+	def self.find_apache2_executable(*possible_names)
+		[apache2_bindir, apache2_sbindir].each do |bindir|
+			if bindir.nil?
+				next
+			end
+			possible_names.each do |name|
+				filename = "#{bindir}/#{name}"
+				if File.file?(filename) && File.executable?(filename)
+					return filename
+				end
+			end
+		end
+		return nil
+	end
+	
+	def self.determine_apr_info
+		if apr_config.nil?
+			return [nil, nil]
+		else
+			flags = `#{apr_config} --cppflags --includes`.strip
+			libs = `#{apr_config} --link-ld`.strip
+			flags.gsub!(/-O\d? /, '')
+			if RUBY_PLATFORM =~ /solaris/
+				# Remove flags not supported by GCC
+				flags = flags.split(/ +/).reject{ |f| f =~ /^\-mt/ }.join(' ')
+			end
+			return [flags, libs]
+		end
+	end
+	memoize :determine_apr_info
+
+	def self.determine_apu_info
+		if apu_config.nil?
+			return [nil, nil]
+		else
+			flags = `#{apu_config} --includes`.strip
+			libs = `#{apu_config} --link-ld`.strip
+			flags.gsub!(/-O\d? /, '')
+			return [flags, libs]
+		end
+	end
+	memoize :determine_apu_info
+	
+	def self.read_file(filename)
+		return File.read(filename)
+	rescue
+		return ""
+	end
+
+public
+	# The absolute path to the current Ruby interpreter.
+	RUBY = Config::CONFIG['bindir'] + '/' + Config::CONFIG['RUBY_INSTALL_NAME'] + Config::CONFIG['EXEEXT']
+	# The correct 'gem' command for this Ruby interpreter.
+	GEM = locate_ruby_executable('gem')
+	
+	# 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)
+		ENV['PATH'].split(File::PATH_SEPARATOR).detect do |directory|
+			path = File.join(directory, name.to_s)
+			if File.executable?(path)
+				return path
+			end
+		end
+		return nil
+	end
+	
+	
+	################ Programs ################
+	
+	
+	# Returns the absolute path to the Rake executable that
+	# belongs to the current Ruby interpreter. Returns nil if it
+	# doesn't exist.
+	def self.rake
+		return locate_ruby_executable('rake')
+	end
+	memoize :rake
+	
+	# Returns the absolute path to the RSpec runner program that
+	# belongs to the current Ruby interpreter. Returns nil if it
+	# doesn't exist.
+	def self.rspec
+		return locate_ruby_executable('spec')
+	end
+	memoize :rspec
+	
+	# The absolute path to the 'apxs' or 'apxs2' executable, or nil if not found.
+	def self.apxs2
+		if env_defined?("APXS2")
+			return ENV["APXS2"]
+		end
+		['apxs2', 'apxs'].each do |name|
+			command = find_command(name)
+			if !command.nil?
+				return command
+			end
+		end
+		return nil
+	end
+	memoize :apxs2
+	
+	# The absolute path to the 'apachectl' or 'apache2ctl' binary.
+	def self.apache2ctl
+		return find_apache2_executable('apache2ctl', 'apachectl2', 'apachectl')
+	end
+	memoize :apache2ctl
+	
+	# The absolute path to the Apache binary (that is, 'httpd', 'httpd2', 'apache' or 'apache2').
+	def self.httpd
+		if env_defined?('HTTPD')
+			return ENV['HTTPD']
+		elsif apxs2.nil?
+			["apache2", "httpd2", "apache", "httpd"].each do |name|
+				command = find_command(name)
+				if !command.nil?
+					return command
+				end
+			end
+			return nil
+		else
+			return find_apache2_executable(`#{apxs2} -q TARGET`.strip)
+		end
+	end
+	memoize :httpd
+	
+	# The absolute path to the 'apr-config' or 'apr-1-config' executable.
+	def self.apr_config
+		if env_defined?('APR_CONFIG')
+			return ENV['APR_CONFIG']
+		elsif apxs2.nil?
+			return nil
+		else
+			filename = `#{apxs2} -q APR_CONFIG 2>/dev/null`.strip
+			if filename.empty?
+				apr_bindir = `#{apxs2} -q APR_BINDIR 2>/dev/null`.strip
+				if apr_bindir.empty?
+					return nil
+				else
+					return select_executable(apr_bindir,
+						"apr-1-config", "apr-config")
+				end
+			elsif File.exist?(filename)
+				return filename
+			else
+				return nil
+			end
+		end
+	end
+	memoize :apr_config
+	
+	# The absolute path to the 'apu-config' or 'apu-1-config' executable.
+	def self.apu_config
+		if env_defined?('APU_CONFIG')
+			return ENV['APU_CONFIG']
+		elsif apxs2.nil?
+			return nil
+		else
+			filename = `#{apxs2} -q APU_CONFIG 2>/dev/null`.strip
+			if filename.empty?
+				apu_bindir = `#{apxs2} -q APU_BINDIR 2>/dev/null`.strip
+				if apu_bindir.empty?
+					return nil
+				else
+					return select_executable(apu_bindir,
+						"apu-1-config", "apu-config")
+				end
+			elsif File.exist?(filename)
+				return filename
+			else
+				return nil
+			end
+		end
+	end
+	memoize :apu_config
+	
+	
+	################ Directories ################
+	
+	
+	# The absolute path to the Apache 2 'bin' directory.
+	def self.apache2_bindir
+		if apxs2.nil?
+			return nil
+		else
+			return `#{apxs2} -q BINDIR 2>/dev/null`.strip
+		end
+	end
+	memoize :apache2_bindir
+	
+	# The absolute path to the Apache 2 'sbin' directory.
+	def self.apache2_sbindir
+		if apxs2.nil?
+			return nil
+		else
+			return `#{apxs2} -q SBINDIR`.strip
+		end
+	end
+	memoize :apache2_sbindir
+	
+	
+	################ Compiler and linker flags ################
+	
+	
+	# Compiler flags that should be used for compiling every C/C++ program,
+	# for portability reasons. These flags should be specified as last
+	# when invoking the compiler.
+	def self.portability_cflags
+		# _GLIBCPP__PTHREADS is for fixing Boost compilation on OpenBSD.
+		flags = ["-D_REENTRANT -D_GLIBCPP__PTHREADS -I/usr/local/include"]
+		if RUBY_PLATFORM =~ /solaris/
+			flags << '-D_XOPEN_SOURCE=500 -D_XPG4_2 -D__EXTENSIONS__ -D__SOLARIS__'
+			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/
+		elsif RUBY_PLATFORM =~ /openbsd/
+			flags << '-DBOOST_HAS_STDINT_H'
+		end
+		return flags.compact.join(" ").strip
+	end
+	memoize :portability_cflags
+	
+	# Linker flags that should be used for linking every C/C++ program,
+	# for portability reasons. These flags should be specified as last
+	# when invoking the linker.
+	def self.portability_ldflags
+		if RUBY_PLATFORM =~ /solaris/
+			return '-lxnet -lrt -lsocket -lnsl -lpthread'
+		else
+			return '-lpthread'
+		end
+	end
+	memoize :portability_ldflags
+	
+	# 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.
+			return '-ggdb'
+		else
+			return '-g'
+		end
+	end
+	
+	# The C compiler flags that are necessary to compile an Apache module.
+	# Includes portability_cflags.
+	def self.apache2_module_cflags(with_apr_flags = true)
+		flags = ["-fPIC"]
+		if with_apr_flags
+			flags << apr_flags
+			flags << apu_flags
+		end
+		if !apxs2.nil?
+			apxs2_flags = `#{apxs2} -q CFLAGS`.strip << " -I" << `#{apxs2} -q INCLUDEDIR`.strip
+			apxs2_flags.gsub!(/-O\d? /, '')
+
+			# Remove flags not supported by GCC
+			if RUBY_PLATFORM =~ /solaris/ # TODO: Add support for people using SunStudio
+				# The big problem is Coolstack apxs includes a bunch of solaris -x directives.
+				options = apxs2_flags.split
+				options.reject! { |f| f =~ /^\-x/ }
+				options.reject! { |f| f =~ /^\-Xa/ }
+				apxs2_flags = options.join(' ')
+			end
+			
+			apxs2_flags.strip!
+			flags << apxs2_flags
+		end
+		if !httpd.nil? && RUBY_PLATFORM =~ /darwin/
+			# Add possible universal binary flags.
+			architectures = []
+			`file "#{httpd}"`.split("\n").grep(/for architecture/).each do |line|
+				line =~ /for architecture (.*?)\)/
+				architectures << "-arch #{$1}"
+			end
+			flags << architectures.join(' ')
+		end
+		flags << portability_cflags
+		return flags.compact.join(' ').strip
+	end
+	memoize :apache2_module_cflags
+	
+	# Linker flags that are necessary for linking an Apache module.
+	# Includes portability_ldflags
+	def self.apache2_module_ldflags
+		flags = "-fPIC #{apr_libs} #{apu_libs} #{portability_ldflags}"
+		flags.strip!
+		return flags
+	end
+	memoize :apache2_module_ldflags
+	
+	# The C compiler flags that are necessary for programs that use APR.
+	def self.apr_flags
+		return determine_apr_info[0]
+	end
+	
+	# The linker flags that are necessary for linking programs that use APR.
+	def self.apr_libs
+		return determine_apr_info[1]
+	end
+	
+	# The C compiler flags that are necessary for programs that use APR-Util.
+	def self.apu_flags
+		return determine_apu_info[0]
+	end
+	
+	# The linker flags that are necessary for linking programs that use APR-Util.
+	def self.apu_libs
+		return determine_apu_info[1]
+	end
+	
+	
+	################ Miscellaneous information ################
+	
+	
+	# Returns whether it is necessary to use information outputted by
+	# 'apr-config' and 'apu-config' in order to compile an Apache module.
+	# When Apache is installed with --with-included-apr, the APR/APU
+	# 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?
+		filename = File.join("/tmp/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?
+
+	# The current platform's shared library extension ('so' on most Unices).
+	def self.library_extension
+		if RUBY_PLATFORM =~ /darwin/
+			return "bundle"
+		else
+			return "so"
+		end
+	end
+	
+	# An identifier for the current Linux distribution. nil if the operating system is not Linux.
+	def self.linux_distro
+		if RUBY_PLATFORM !~ /linux/
+			return nil
+		end
+		lsb_release = read_file("/etc/lsb-release")
+		if lsb_release =~ /Ubuntu/
+			return :ubuntu
+		elsif File.exist?("/etc/debian_version")
+			return :debian
+		elsif File.exist?("/etc/redhat-release")
+			redhat_release = read_file("/etc/redhat-release")
+			if redhat_release =~ /CentOS/
+				return :centos
+			elsif redhat_release =~ /Fedora/  # is this correct?
+				return :fedora
+			else
+				# On official RHEL distros, the content is in the form of
+				# "Red Hat Enterprise Linux Server release 5.1 (Tikanga)"
+				return :rhel
+			end
+		elsif File.exist?("/etc/suse-release")
+			return :suse
+		elsif File.exist?("/etc/gentoo-release")
+			return :gentoo
+		else
+			return :unknown
+		end
+		# TODO: Slackware, Mandrake/Mandriva
+	end
+	memoize :linux_distro
+end