passenger 4.0.10 → 4.0.13

data/lib/phusion_passenger.rb

@@ -30,10 +30,10 @@ module PhusionPassenger
 	
 	PACKAGE_NAME = 'passenger'
 	# Run 'rake ext/common/Constants.h' after changing this number.
-	VERSION_STRING = '4.0.10'
+	VERSION_STRING = '4.0.13'
 	
-	PREFERRED_NGINX_VERSION = '1.4.1'
-	NGINX_SHA256_CHECKSUM = 'bca5d1e89751ba29406185e1736c390412603a7e6b604f5b4575281f6565d119'
+	PREFERRED_NGINX_VERSION = '1.4.2'
+	NGINX_SHA256_CHECKSUM = '5361ffb7b0ebf8b1a04369bc3d1295eaed091680c1c58115f88d56c8e51f3611'
 
 	PREFERRED_PCRE_VERSION  = '8.32'
 	PCRE_SHA256_CHECKSUM = 'd5d8634b36baf3d08be442a627001099583b397f456bc795304a013383b6423a'
@@ -44,7 +44,6 @@ module PhusionPassenger
 	###### Directories ######
 	
 	GLOBAL_NAMESPACE_DIRNAME            = "passenger"
-	GLOBAL_STANDALONE_NAMESPACE_DIRNAME = "passenger-standalone"
 	# Subdirectory under $HOME to use for storing stuff.
 	USER_NAMESPACE_DIRNAME              = ".passenger"
 	
@@ -55,11 +54,24 @@ module PhusionPassenger
 		"~/#{USER_NAMESPACE_DIRNAME}/plugins"
 	]
 	
-	# Directory under $HOME for storing Phusion Passenger Standalone runtime files.
-	LOCAL_STANDALONE_RESOURCE_DIR  = File.join(USER_NAMESPACE_DIRNAME, "standalone")
-	
-	# System-wide directory for storing Phusion Passenger Standalone runtime files.
-	GLOBAL_STANDALONE_RESOURCE_DIR = "/var/lib/#{GLOBAL_STANDALONE_NAMESPACE_DIRNAME}".freeze
+	REQUIRED_LOCATIONS_INI_FIELDS = [
+		:bin_dir,
+		:agents_dir,
+		:lib_dir,
+		:helper_scripts_dir,
+		:resources_dir,
+		:include_dir,
+		:doc_dir,
+		:ruby_libdir,
+		:apache2_module_path,
+		:ruby_extension_source_dir,
+		:nginx_module_source_dir
+	].freeze
+	OPTIONAL_LOCATIONS_INI_FIELDS = [
+		# Directory in which downloaded Phusion Passenger binaries are stored.
+		# Only available when originally packaged.
+		:download_cache_dir
+	].freeze
 	
 	# Follows the logic of ext/common/ResourceLocator.h, so don't forget to modify that too.
 	def self.locate_directories(source_root_or_location_configuration_file = nil)
@@ -68,32 +80,15 @@ module PhusionPassenger
 		
 		if root_or_file && File.file?(root_or_file)
 			filename = root_or_file
-			options  = {}
-			in_locations_section = false
-			File.open(filename, 'r') do |f|
-				while !f.eof?
-					line = f.readline
-					line.strip!
-					next if line.empty?
-					if line =~ /\A\[(.+)\]\Z/
-						in_locations_section = $1 == 'locations'
-					elsif in_locations_section && line =~ /=/
-						key, value = line.split(/ *= */, 2)
-						options[key.freeze] = value.freeze
-					end
-				end
-			end
+			options  = parse_ini_file(filename)
 			
 			@natively_packaged     = get_bool_option(filename, options, 'natively_packaged')
-			@bin_dir               = get_option(filename, options, 'bin').freeze
-			@agents_dir            = get_option(filename, options, 'agents').freeze
-			@lib_dir               = get_option(filename, options, 'libdir').freeze
-			@helper_scripts_dir    = get_option(filename, options, 'helper_scripts').freeze
-			@resources_dir         = get_option(filename, options, 'resources').freeze
-			@include_dir           = get_option(filename, options, 'includedir').freeze
-			@doc_dir               = get_option(filename, options, 'doc').freeze
-			@apache2_module_path   = get_option(filename, options, 'apache2_module').freeze
-			@ruby_extension_source_dir = get_option(filename, options, 'ruby_extension_source').freeze
+			REQUIRED_LOCATIONS_INI_FIELDS.each do |field|
+				instance_variable_set("@#{field}", get_option(filename, options, field.to_s).freeze)
+			end
+			OPTIONAL_LOCATIONS_INI_FIELDS.each do |field|
+				instance_variable_set("@#{field}", get_option(filename, options, field.to_s, false).freeze)
+			end
 		else
 			@source_root           = File.dirname(File.dirname(FILE_LOCATION))
 			@natively_packaged     = false
@@ -104,8 +99,16 @@ module PhusionPassenger
 			@resources_dir         = "#{@source_root}/resources".freeze
 			@include_dir           = "#{@source_root}/ext".freeze
 			@doc_dir               = "#{@source_root}/doc".freeze
+			@ruby_libdir           = File.dirname(FILE_LOCATION)
 			@apache2_module_path   = "#{@source_root}/buildout/apache2/mod_passenger.so".freeze
 			@ruby_extension_source_dir = "#{@source_root}/ext/ruby"
+			@nginx_module_source_dir   = "#{@source_root}/ext/nginx"
+			@download_cache_dir    = "#{@source_root}/download_cache"
+			REQUIRED_LOCATIONS_INI_FIELDS.each do |field|
+				if instance_variable_get("@#{field}").nil?
+					raise "BUG: @#{field} not set"
+				end
+			end
 		end
 	end
 	
@@ -119,66 +122,42 @@ module PhusionPassenger
 		return @natively_packaged
 	end
 
+	# Whether the current Phusion Passenger installation is installed
+	# from a release package, e.g. an official gem or official tarball.
+	# Retruns false if e.g. the gem was built by the user, or if this
+	# install is from a git repository.
+	def self.installed_from_release_package?
+		File.exist?("#{resources_dir}/release.txt")
+	end
+
 	# When originally packaged, returns the source root.
 	# When natively packaged, returns the location of the location configuration file.
 	def self.source_root
 		return @source_root
 	end
-	
-	def self.bin_dir
-		return @bin_dir
-	end
-	
-	def self.agents_dir
-		return @agents_dir
-	end
-
-	def self.lib_dir
-		return @lib_dir
-	end
-	
-	def self.helper_scripts_dir
-		return @helper_scripts_dir
-	end
-	
-	def self.resources_dir
-		return @resources_dir
-	end
 
-	def self.include_dir
-		return @include_dir
+	# Generate getters for the directory types in locations.ini.
+	getters_code = ""
+	@ruby_libdir = File.dirname(FILE_LOCATION)
+	(REQUIRED_LOCATIONS_INI_FIELDS + OPTIONAL_LOCATIONS_INI_FIELDS).each do |field|
+		getters_code << %Q{
+			def self.#{field}
+				return @#{field}
+			end
+		}
 	end
+	eval(getters_code, binding, __FILE__, __LINE__)
 	
-	def self.doc_dir
-		return @doc_dir
-	end
 	
-	def self.ruby_libdir
-		@libdir ||= File.dirname(FILE_LOCATION)
-	end
+	###### Other resource locations ######
 	
-	def self.apache2_module_path
-		return @apache2_module_path
-	end
+	BINARIES_URL_ROOT  = "https://oss-binaries.phusionpassenger.com/binaries/passenger/by_release"
 
-	def self.ruby_extension_source_dir
-		return @ruby_extension_source_dir
-	end
-
-	def self.nginx_addon_dir
-		if PhusionPassenger.natively_packaged?
-			return "#{resources_dir}/ngx_http_passenger_module"
-		else
-			return "#{source_root}/ext/nginx"
-		end
+	def self.binaries_ca_cert_path
+		return "#{resources_dir}/oss-binaries.phusionpassenger.com.crt"
 	end
 	
 	
-	###### Other resource locations ######
-	
-	STANDALONE_BINARIES_URL_ROOT  = "http://standalone-binaries.modrails.com"
-	
-	
 	if !$LOAD_PATH.include?(ruby_libdir)
 		$LOAD_PATH.unshift(ruby_libdir)
 		$LOAD_PATH.uniq!
@@ -201,7 +180,7 @@ private
 			home_dir = ENV['HOME']
 		end
 		if home_dir && !home_dir.empty?
-			filename = "#{home_dir}/.passenger/locations.ini"
+			filename = "#{home_dir}/#{USER_NAMESPACE_DIRNAME}/locations.ini"
 			return filename if File.exist?(filename)
 		end
 
@@ -211,6 +190,25 @@ private
 		return nil
 	end
 
+	def self.parse_ini_file(filename)
+		options  = {}
+		in_locations_section = false
+		File.open(filename, 'r') do |f|
+			while !f.eof?
+				line = f.readline
+				line.strip!
+				next if line.empty?
+				if line =~ /\A\[(.+)\]\Z/
+					in_locations_section = $1 == 'locations'
+				elsif in_locations_section && line =~ /=/
+					key, value = line.split(/ *= */, 2)
+					options[key.freeze] = value.freeze
+				end
+			end
+		end
+		return options
+	end
+
 	def self.get_option(filename, options, key, required = true)
 		value = options[key]
 		if value

data/lib/phusion_passenger/abstract_installer.rb

@@ -27,6 +27,7 @@ require 'phusion_passenger/console_text_template'
 require 'phusion_passenger/platform_info'
 require 'phusion_passenger/platform_info/operating_system'
 require 'phusion_passenger/utils/ansi_colors'
+require 'fileutils'
 
 # IMPORTANT: do not directly or indirectly require native_support; we can't compile
 # it yet until we have a compiler, and installers usually check whether a compiler
@@ -159,11 +160,7 @@ protected
 	end
 
 	def check_whether_os_is_broken
-		if PlatformInfo.os_name == "freebsd9" && `uname -r` =~ /^9\.1-/
-			new_screen
-			render_template 'installer_common/freebsd9_broken_cxx_runtime'
-			wait
-		end
+		# No known broken OSes at the moment.
 	end
 
 	def check_whether_system_has_enough_ram(required = 1024)
@@ -341,11 +338,28 @@ protected
 		sh!("#{PlatformInfo.rake_command} #{args.join(' ')}")
 	end
 	
-	def download(url, output)
+	def download(url, output, options = {})
+		if options[:use_cache] && cache_dir = PhusionPassenger.download_cache_dir
+			basename = url.sub(/.*\//, '')
+			if File.exist?("#{cache_dir}/#{basename}")
+				puts "Copying #{basename} from #{cache_dir}..."
+				FileUtils.cp("#{cache_dir}/#{basename}", output)
+				return true
+			end
+		end
+
+		args = []
 		if PlatformInfo.find_command("wget")
-			return sh("wget", "-O", output, url)
+			if options[:cacert]
+				args << "--ca-certificate=#{options[:cacert]}"
+			end
+			return sh("wget", "--tries=3", "-O", output, url, *args)
 		else
-			return sh("curl", url, "-f", "-L", "-o", output)
+			if options[:cacert]
+				args << "--cacert"
+				args << options[:cacert]
+			end
+			return sh("curl", url, "-f", "-L", "-o", output, *args)
 		end
 	end
 end

data/lib/phusion_passenger/console_text_template.rb

@@ -35,7 +35,7 @@ class ConsoleTextTemplate
 			data = input[:text]
 		end
 		@template = ERB.new(Utils::AnsiColors.ansi_colorize(data),
-			nil, nil, '@buffer')
+			nil, '-', '@buffer')
 		options.each_pair do |name, value|
 			self[name] = value
 		end

data/lib/phusion_passenger/loader_shared_helpers.rb

@@ -262,7 +262,8 @@ module LoaderSharedHelpers
 	
 	def advertise_sockets(output, request_handler)
 		request_handler.server_sockets.each_pair do |name, options|
-			output.puts "!> socket: #{name};#{options[:address]};#{options[:protocol]};#{options[:concurrency]}"
+			concurrency = PhusionPassenger.advertised_concurrency_level || options[:concurrency]
+			output.puts "!> socket: #{name};#{options[:address]};#{options[:protocol]};#{concurrency}"
 		end
 	end
 	

data/lib/phusion_passenger/native_support.rb

@@ -24,17 +24,24 @@
 module PhusionPassenger
 
 class NativeSupportLoader
-	def supported?
+	def self.supported?
 		return !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx"
 	end
+
+	def try_load
+		if defined?(NativeSupport)
+			return true
+		else
+			require 'phusion_passenger'
+			load_from_native_support_output_dir ||
+			load_from_source_root ||
+			load_from_load_path ||
+			load_from_home_dir
+		end
+	end
 	
 	def start
-		require 'phusion_passenger'
-		load_from_native_support_output_dir ||
-		load_from_source_root ||
-		load_from_load_path ||
-		load_from_home_dir ||
-		compile_and_load
+		try_load || download_binary_and_load || compile_and_load
 	end
 
 private
@@ -120,6 +127,11 @@ private
 			return false
 		end
 	end
+
+	def download_binary_and_load
+		# TODO
+		return false
+	end
 	
 	def compile_and_load
 		STDERR.puts "*** Phusion Passenger: no #{library_name} found for " +
@@ -224,5 +236,6 @@ end
 
 end
 
-loader = PhusionPassenger::NativeSupportLoader.new
-loader.start if loader.supported?
+if PhusionPassenger::NativeSupportLoader.supported?
+	PhusionPassenger::NativeSupportLoader.new.start
+end

data/lib/phusion_passenger/packaging.rb

@@ -54,6 +54,7 @@ module Packaging
 	# A list of globs which match all files that should be packaged
 	# in the Phusion Passenger gem or tarball.
 	GLOB = [
+		'.gitignore',
 		'.travis.yml',
 		'configure',
 		'Rakefile',
@@ -72,7 +73,8 @@ module Packaging
 		'doc/**/*',
 		'man/*',
 		'debian.template/**/*',
-		'helper-scripts/*',
+		'rpm/**/*',
+		'helper-scripts/**/*',
 		'ext/common/**/*.{cpp,c,h,hpp,md,erb}',
 		'ext/apache2/*.{cpp,h,hpp,c}',
 		'ext/nginx/*.{c,cpp,h}',
@@ -88,6 +90,7 @@ module Packaging
 		'ext/libeio/{*.h,*.c}',
 		'ext/oxt/*.hpp',
 		'ext/oxt/*.cpp',
+		'ext/oxt/*.txt',
 		'ext/oxt/detail/*.hpp',
 		'ext/ruby/*.{c,rb}',
 		'dev/*',
@@ -95,13 +98,15 @@ module Packaging
 		'test/.rspec',
 		'test/*.example',
 		'test/*.travis',
+		'test/*.supp',
 		'test/support/*.{c,cpp,h,rb}',
 		'test/tut/*',
 		'test/cxx/**/*.{cpp,h}',
 		'test/oxt/*.{cpp,hpp}',
 		'test/ruby/**/*',
 		'test/integration_tests/**/*',
-		'test/stub/**/*'
+		'test/stub/**/*',
+		'test/stub/**/.*'
 	]
 	
 	EXCLUDE_GLOB = [

data/lib/phusion_passenger/platform_info.rb

@@ -346,7 +346,8 @@ public
 				return nil
 			end
 		else
-			ENV['PATH'].to_s.split(File::PATH_SEPARATOR).detect do |directory|
+			ENV['PATH'].to_s.split(File::PATH_SEPARATOR).each do |directory|
+				next if directory.empty?
 				path = File.join(directory, name)
 				if File.file?(path) && File.executable?(path)
 					return path
@@ -355,6 +356,32 @@ public
 			return nil
 		end
 	end
+
+	def self.find_all_commands(name)
+		search_dirs = ENV['PATH'].to_s.split(File::PATH_SEPARATOR)
+		search_dirs.concat(%w(/bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin))
+		["/opt/*/bin", "/usr/local/*/bin"].each do |glob|
+			search_dirs.concat(Dir[glob])
+		end
+		search_dirs.delete("")
+		search_dirs.uniq!
+
+		result = []
+		search_dirs.each do |directory|
+			path = File.join(directory, name)
+			if !File.exist?(path)
+				log "Looking for #{path}: not found"
+			elsif !File.file?(path)
+				log "Looking for #{path}: found, but is not a file"
+			elsif !File.executable?(path)
+				log "Looking for #{path}: found, but is not executable"
+			else
+				log "Looking for #{path}: found"
+				result << path
+			end
+		end
+		return result
+	end
 end
 
 end # module PhusionPassenger

data/lib/phusion_passenger/platform_info/apache.rb

@@ -1,5 +1,5 @@
 #  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.
 #
@@ -57,14 +57,15 @@ module PlatformInfo
 	
 	# The absolute path to the 'apachectl' or 'apache2ctl' binary, or nil if
 	# not found.
-	def self.apache2ctl
-		return find_apache2_executable('apache2ctl', 'apachectl2', 'apachectl')
+	def self.apache2ctl(options = {})
+		return find_apache2_executable('apache2ctl', 'apachectl2', 'apachectl', options)
 	end
 	memoize :apache2ctl
 	
 	# The absolute path to the Apache binary (that is, 'httpd', 'httpd2', 'apache'
 	# or 'apache2'), or nil if not found.
-	def self.httpd
+	def self.httpd(options = {})
+		apxs2 = options[:apxs2] || self.apxs2
 		if env_defined?('HTTPD')
 			return ENV['HTTPD']
 		elsif apxs2.nil?
@@ -76,13 +77,18 @@ module PlatformInfo
 			end
 			return nil
 		else
-			return find_apache2_executable(`#{apxs2} -q TARGET`.strip)
+			return find_apache2_executable(`#{apxs2} -q TARGET`.strip, options)
 		end
 	end
 	memoize :httpd
 
 	# The Apache version, or nil if Apache is not found.
-	def self.httpd_version
+	def self.httpd_version(options = nil)
+		if options
+			httpd = options[:httpd] || self.httpd(options)
+		else
+			httpd = self.httpd
+		end
 		if httpd
 			`#{httpd} -v` =~ %r{Apache/([\d\.]+)}
 			return $1
@@ -91,6 +97,181 @@ module PlatformInfo
 		end
 	end
 	memoize :httpd_version
+
+	# The Apache root directory.
+	def self.httpd_root(options = nil)
+		if info = httpd_V(options)
+			info =~ / -D HTTPD_ROOT="(.+)"$/
+			return $1
+		else
+			return nil
+		end
+	end
+	memoize :httpd_root
+
+	# The default Apache configuration file, or nil if Apache is not found.
+	def self.httpd_default_config_file(options = nil)
+		if info = httpd_V(options)
+			info =~ /-D SERVER_CONFIG_FILE="(.+)"$/
+			filename = $1
+			if filename =~ /\A\//
+				return filename
+			else
+				# Not an absolute path. Infer from root.
+				if root = httpd_root(options)
+					return "#{root}/#{filename}"
+				else
+					return nil
+				end
+			end
+		else
+			return nil
+		end
+	end
+	memoize :httpd_default_config_file
+
+	# The default Apache error log's filename, as it is compiled into the Apache
+	# main executable. This may not be the actual error log that is used. The actual
+	# error log depends on the configuration file.
+	# 
+	# Returns nil if Apache is not detected, or if the default error log filename
+	# cannot be detected.
+	def self.httpd_default_error_log(options = nil)
+		if info = httpd_V(options)
+			info =~ /-D DEFAULT_ERRORLOG="(.+)"$/
+			filename = $1
+			if filename =~ /\A\//
+				return filename
+			else
+				# Not an absolute path. Infer from root.
+				if root = httpd_root(options)
+					return "#{root}/#{filename}"
+				else
+					return nil
+				end
+			end
+		else
+			return nil
+		end
+	end
+	memoize :httpd_default_error_log
+
+	def self.httpd_actual_error_log(options = nil)
+		if config_file = httpd_default_config_file(options)
+			contents = File.read(config_file)
+			# We don't want to match comments
+			contents.gsub!(/^[ \t]*#.*/, '')
+			if contents =~ /^ErrorLog (.+)$/
+				filename = $1.strip.sub(/^"/, '').sub(/"$/, '')
+				if filename.include?("${")
+					log "Error log seems to be located in \"#{filename}\", " +
+						"but value contains environment variables. " +
+						"Attempting to substitute them..."
+				end
+				# The Apache config file supports environment variable
+				# substitution. Ubuntu uses this extensively.
+				filename.gsub!(/\$\{(.+?)\}/) do |varname|
+					if value = httpd_infer_envvar($1, options)
+						log "Substituted \"#{varname}\" -> \"#{value}\""
+						value
+					else
+						log "Cannot substituted \"#{varname}\""
+						varname
+					end
+				end
+				if filename.include?("${")
+					# We couldn't substitute everything.
+					return nil
+				else
+					return filename
+				end
+			elsif contents =~ /ErrorLog/
+				# The user apparently has ErrorLog set somewhere but
+				# we can't parse it. The default error log location,
+				# as reported by `httpd -V`, may be wrong (it is on OS X).
+				# So to be safe, let's assume that we don't know.
+				return nil
+			else
+				return httpd_default_error_log(options)
+			end
+		else
+			return nil
+		end
+	end
+	memoize :httpd_actual_error_log
+
+	# The location of the Apache envvars file, which exists on some systems such as Ubuntu.
+	# Returns nil if Apache is not found or if the envvars file is not found.
+	def self.httpd_envvars_file(options = nil)
+		if options
+			httpd = options[:httpd] || self.httpd(options)
+		else
+			httpd = self.httpd
+		end
+		
+		httpd_dir = File.dirname(httpd)
+		if httpd_dir == "/usr/bin" || httpd_dir == "/usr/sbin"
+			if File.exist?("/etc/apache2/envvars")
+				return "/etc/apache2/envvars"
+			elsif File.exist?("/etc/httpd/envvars")
+				return "/etc/httpd/envvars"
+			end
+		end
+		
+		conf_dir = File.expand_path(File.dirname(httpd) + "/../conf")
+		if File.exist?("#{conf_dir}/envvars")
+			return "#{conf_dir}/envvars"
+		end
+
+		return nil
+	end
+
+	def self.httpd_infer_envvar(varname, options = nil)
+		if envfile = httpd_envvars_file(options)
+			result = `. '#{envfile}' && echo $#{varname}`.strip
+			if $? && $?.exitstatus == 0
+				return result
+			else
+				return nil
+			end
+		else
+			return nil
+		end
+	end
+
+	# Whether Apache appears to support a2enmod and a2dismod.
+	def self.httpd_supports_a2enmod?(options = nil)
+		config_file = httpd_default_config_file(options)
+		if config_file
+			config_dir = File.dirname(config_file)
+			return File.exist?("#{config_dir}/mods-available") &&
+				File.exist?("#{config_dir}/mods-enabled")
+		else
+			return nil
+		end
+	end
+
+	# The absolute path to the 'a2enmod' executable.
+	def self.a2enmod(options = {})
+		apxs2 = options[:apxs2] || self.apxs2
+		if env_defined?('A2ENMOD')
+			return ENV['A2ENMOD']
+		else
+			return find_apache2_executable("a2enmod", options)
+		end
+	end
+	memoize :a2enmod
+
+	# The absolute path to the 'a2enmod' executable.
+	def self.a2dismod(options = {})
+		apxs2 = options[:apxs2] || self.apxs2
+		if env_defined?('A2DISMOD')
+			return ENV['A2DISMOD']
+		else
+			return find_apache2_executable("a2dismod", options)
+		end
+	end
+	memoize :a2dismod
 	
 	# The absolute path to the 'apr-config' or 'apr-1-config' executable,
 	# or nil if not found.
@@ -143,12 +324,48 @@ module PlatformInfo
 		end
 	end
 	memoize :apu_config
+
+	# Find an executable in the Apache 'bin' and 'sbin' directories.
+	# Returns nil if not found.
+	def self.find_apache2_executable(*possible_names)
+		if possible_names.last.is_a?(Hash)
+			options = possible_names.pop
+			options = nil if options.empty?
+		end
+
+		if options
+			dirs = options[:dirs] || [apache2_bindir(options), apache2_sbindir(options)]
+		else
+			dirs = [apache2_bindir, apache2_sbindir]
+		end
+
+		dirs.each do |bindir|
+			if bindir.nil?
+				next
+			end
+			possible_names.each do |name|
+				filename = "#{bindir}/#{name}"
+				if !File.exist?(filename)
+					log "Looking for #{filename}: not found"
+				elsif !File.file?(filename)
+					log "Looking for #{filename}: found, but is not a file"
+				elsif !File.executable?(filename)
+					log "Looking for #{filename}: found, but is not executable"
+				else
+					log "Looking for #{filename}: found"
+					return filename
+				end
+			end
+		end
+		return nil
+	end
 	
 	
 	################ Directories ################
 	
 	# The absolute path to the Apache 2 'bin' directory, or nil if unknown.
-	def self.apache2_bindir
+	def self.apache2_bindir(options = {})
+		apxs2 = options[:apxs2] || self.apxs2
 		if apxs2.nil?
 			return nil
 		else
@@ -158,7 +375,8 @@ module PlatformInfo
 	memoize :apache2_bindir
 	
 	# The absolute path to the Apache 2 'sbin' directory, or nil if unknown.
-	def self.apache2_sbindir
+	def self.apache2_sbindir(options = {})
+		apxs2 = options[:apxs2] || self.apxs2
 		if apxs2.nil?
 			return nil
 		else
@@ -285,24 +503,6 @@ module PlatformInfo
 	memoize :apr_config_needed_for_building_apache_modules?
 
 private
-	# Find an executable in the Apache 'bin' and 'sbin' directories.
-	# Returns nil if not found.
-	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
-	private_class_method :find_apache2_executable
-	
 	def self.determine_apr_info
 		if apr_config.nil?
 			return [nil, nil]
@@ -334,6 +534,26 @@ private
 	end
 	memoize :determine_apu_info
 	private_class_method :determine_apu_info
+
+	# Run `httpd -V` and return its output. On some systems, such as Ubuntu 13.10,
+	# `httpd -V` fails without the environment variables defined in various scripts.
+	# Here we take care of evaluating those scripts before running `httpd -V`.
+	def self.httpd_V(options = nil)
+		if options
+			httpd = options[:httpd] || self.httpd(options)
+		else
+			httpd = self.httpd
+		end
+		if httpd
+			command = "#{httpd} -V"
+			if envvars_file = httpd_envvars_file(options)
+				command = ". '#{envvars_file}' && #{command}"
+			end
+			return `#{command}`
+		else
+			return nil
+		end
+	end
 end
 
 end