passenger 4.0.33 → 4.0.34

data/lib/phusion_passenger/platform_info/apache_detector.rb

@@ -36,6 +36,9 @@ module PlatformInfo
 # many people have multiple Apache installations on their system, but they
 # don't know about that, or they don't know how to compile against the
 # correct Apache installation. This tool helps them.
+# 
+# If you use this class to log things to the terminal, then be sure to set
+# the terminal color to Utils::AnsiColors::DEFAULT_TERMINAL_COLOR.
 class ApacheDetector
 	class Result
 		# These are required and are never nil.
@@ -56,9 +59,9 @@ class ApacheDetector
 			log "      Main executable: #{httpd}"
 			log "      Control command: #{ctl}"
 			log "      Config file    : #{config_file}"
-			log "      Error log file : #{error_log}"
+			log "      Error log file : #{error_log || 'unknown'}"
 			log ""
-			log "   To install Phusion Passenger against this specific Apache version:"
+			log "   To install #{PROGRAM_NAME} against this specific Apache version:"
 			log "      #{PlatformInfo.ruby_command} #{PhusionPassenger.bin_dir}/passenger-install-apache2-module --apxs2-path='#{apxs2}'"
 			log ""
 			log "   To start, stop or restart this specific Apache version:"
@@ -66,9 +69,11 @@ class ApacheDetector
 			log "      #{ctl} stop"
 			log "      #{ctl} restart"
 			log ""
-			log "   To troubleshoot, please read the logs in this file:"
-			log "      #{error_log}"
-			log ""
+			if error_log
+				log "   To troubleshoot, please read the logs in this file:"
+				log "      #{error_log}"
+				log ""
+			end
 		end
 
 	private
@@ -85,9 +90,9 @@ class ApacheDetector
 		PlatformInfo.verbose = true
 		PlatformInfo.log_implementation = lambda do |message|
 			if message =~ /: found$/
-				log("<green> * #{message}</green>")
+				log("<green> --> #{message}</green>")
 			else
-				log(" * #{message}")
+				log(" --> #{message}")
 			end
 		end
 	end
@@ -115,10 +120,11 @@ class ApacheDetector
 			log "Detecting main Apache executable..."
 			result.httpd = PlatformInfo.httpd(:apxs2 => apxs2)
 			if result.httpd
+				log "Detecting version..."
 				if result.version = PlatformInfo.httpd_version(:httpd => result.httpd)
-					log "Version detected: #{result.version}"
+					log " --> #{result.version}"
 				else
-					log "<red>Cannot detect version!</red>"
+					log "<red> --> Cannot detect version!</red>"
 					result.httpd = nil
 				end
 			end
@@ -128,31 +134,28 @@ class ApacheDetector
 				result.httpd = nil if !result.ctl
 			end
 			if result.httpd
+				log "Detecting configuration file location..."
 				result.config_file = PlatformInfo.httpd_default_config_file(:httpd => result.httpd)
 				if result.config_file
-					log "Default config file location detected: #{result.config_file}"
+					log " --> #{result.config_file}"
 				else
-					log "<red>Cannot detect default config file location!</red>"
+					log "<red> --> Cannot detect default config file location!</red>"
 					result.httpd = nil
 				end
 			end
 			if result.httpd
+				log "Detecting error log file..."
 				result.error_log = PlatformInfo.httpd_actual_error_log(:httpd => result.httpd)
 				if result.error_log
-					log "Error log file detected: #{result.error_log}"
+					log " --> #{result.error_log}"
 				else
-					log "<red>Cannot detect error log file!</red>"
-					result.httpd = nil
+					log "<red> --> Cannot detect error log file!</red>"
 				end
 			end
 			if result.httpd
-				if PlatformInfo.httpd_supports_a2enmod?(:httpd => result.httpd)
-					log "This Apache installation does not support a2enmod."
-				else
-					log "Detecting a2enmod and a2dismod..."
-					result.a2enmod = PlatformInfo.a2enmod(:apxs2 => apxs2)
-					result.a2dismod = PlatformInfo.a2dismod(:apxs2 => apxs2)
-				end
+				log "Detecting a2enmod and a2dismod..."
+				result.a2enmod = PlatformInfo.a2enmod(:apxs2 => apxs2)
+				result.a2dismod = PlatformInfo.a2dismod(:apxs2 => apxs2)
 			end
 			if result.httpd
 				log "<green>Found a usable Apache installation using #{apxs2}.</green>"
@@ -178,19 +181,11 @@ class ApacheDetector
 			log "   <b>#{PhusionPassenger.bin_dir}/passenger-install-apache2-module</b>"
 			log ""
 			log "If you are sure that you have Apache installed, please read the documentation:"
-			log " * <b>#{PhusionPassenger.apache2_doc_path}</b>, section"
-			log "   section 'Installation' -> 'Customizing the compilation process' ->"
-			log "   'Forcing location of command line tools and dependencies'"
-			log " * Or visit the online version:"
-			log "   <b>#{APACHE2_DOC_URL}#_forcing_location_of_command_line_tools_and_dependencies</b>"
+			log "<b>#{APACHE2_DOC_URL}#forcing_location_of_command_line_tools_and_dependencies</b>"
 		elsif @results.size > 1
 			log "<yellow>WARNING: You have multiple Apache installations on your system!</yellow>"
 			log "You are strongly recommended to read this section of the documentation:"
-			log " * <b>#{PhusionPassenger.apache2_doc_path}</b>, section"
-			log "   section 'Installation' -> 'Customizing the compilation process' ->"
-			log "   'Forcing location of command line tools and dependencies'"
-			log " * Or visit the online version:"
-			log "   <b>#{APACHE2_DOC_URL}#_forcing_location_of_command_line_tools_and_dependencies</b>"
+			log "<b>#{APACHE2_DOC_URL}#multiple_apache_installs</b>"
 		end
 	end
 

data/lib/phusion_passenger/platform_info/depcheck_specs/apache2.rb

@@ -2,7 +2,7 @@ define 'apache2' do
 	name 'Apache 2'
 	website 'http://httpd.apache.org/'
 	define_checker do
-		require 'phusion_passenger/platform_info/apache'
+		PhusionPassenger.require_passenger_lib 'platform_info/apache'
 		if check_for_command(PlatformInfo.httpd)
 			{
 				:found => true,
@@ -32,7 +32,7 @@ define 'apache2-dev' do
 	name "Apache 2 development headers"
 	website "http://httpd.apache.org/"
 	define_checker do
-		require 'phusion_passenger/platform_info/apache'
+		PhusionPassenger.require_passenger_lib 'platform_info/apache'
 		if PlatformInfo.apxs2
 			{
 				:found => true,
@@ -64,7 +64,7 @@ define 'apr-dev' do
 	name "Apache Portable Runtime (APR) development headers"
 	website "http://httpd.apache.org/"
 	define_checker do
-		require 'phusion_passenger/platform_info/apache'
+		PhusionPassenger.require_passenger_lib 'platform_info/apache'
 		if PlatformInfo.apr_config
 			{
 				:found     => true,
@@ -97,7 +97,7 @@ define 'apu-dev' do
 	name "Apache Portable Runtime Utility (APU) development headers"
 	website "http://httpd.apache.org/"
 	define_checker do
-		require 'phusion_passenger/platform_info/apache'
+		PhusionPassenger.require_passenger_lib 'platform_info/apache'
 		if PlatformInfo.apu_config
 			{
 				:found     => true,

data/lib/phusion_passenger/platform_info/depcheck_specs/compiler_toolchain.rb

@@ -2,7 +2,7 @@ define 'cc' do
   name "C compiler"
   website "http://gcc.gnu.org/"
   define_checker do
-    require 'phusion_passenger/platform_info/compiler'
+    PhusionPassenger.require_passenger_lib 'platform_info/compiler'
     check_for_command(PlatformInfo.cc, false)
   end
   
@@ -27,7 +27,7 @@ define 'c++' do
   name "C++ compiler"
   website "http://gcc.gnu.org/"
   define_checker do
-    require 'phusion_passenger/platform_info/compiler'
+    PhusionPassenger.require_passenger_lib 'platform_info/compiler'
     check_for_command(PlatformInfo.cxx, false)
   end
   
@@ -51,7 +51,7 @@ end
 define 'make' do
   name "The 'make' tool"
   define_checker do
-    require 'phusion_passenger/platform_info/compiler'
+    PhusionPassenger.require_passenger_lib 'platform_info/compiler'
     check_for_command(PlatformInfo.make)
   end
   
@@ -75,7 +75,7 @@ end
 define 'gmake' do
   name "GNU make"
   define_checker do
-    require 'phusion_passenger/platform_info/compiler'
+    PhusionPassenger.require_passenger_lib 'platform_info/compiler'
     check_for_command(PlatformInfo.gnu_make)
   end
   

data/lib/phusion_passenger/platform_info/depcheck_specs/libs.rb

@@ -17,7 +17,7 @@ define 'libcurl-dev' do
 	name "Curl development headers with SSL support"
 	website "http://curl.haxx.se/libcurl"
 	define_checker do
-		require 'phusion_passenger/platform_info/curl'
+		PhusionPassenger.require_passenger_lib 'platform_info/curl'
 		result = { :found => false }
 		
 		if !(curl_config = PlatformInfo.find_command('curl-config'))

data/lib/phusion_passenger/platform_info/depcheck_specs/ruby.rb

@@ -112,7 +112,7 @@ define 'rake' do
   name "Rake (associated with #{ruby_command})"
   website "http://rake.rubyforge.org/"
   define_checker do
-    require 'phusion_passenger/platform_info/ruby'
+    PhusionPassenger.require_passenger_lib 'platform_info/ruby'
     if result = PlatformInfo.rake_command
       { :found => true,
         "Location" => result }

data/lib/phusion_passenger/platform_info/linux.rb

@@ -1,5 +1,6 @@
+# encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #

data/lib/phusion_passenger/platform_info/ruby.rb

@@ -48,7 +48,14 @@ module PlatformInfo
 	# In case of RVM this function will return the path to the RVM wrapper script
 	# that executes the current Ruby interpreter in the currently active gem set.
 	def self.ruby_command
+		# Detect usage of gem-wrappers: https://github.com/rvm/gem-wrappers
+		# This is currently used by RVM >= 1.25, although it's not exclusive to RVM.
+		if GEM_HOME && File.exist?("#{GEM_HOME}/wrappers/ruby")
+			return "#{GEM_HOME}/wrappers/ruby"
+		end
+
 		if in_rvm?
+			# Detect old-school RVM wrapper script location.
 			name = rvm_ruby_string
 			dirs = rvm_paths
 			if name && dirs

data/lib/phusion_passenger/preloader_shared_helpers.rb

@@ -31,7 +31,7 @@ module PhusionPassenger
 module PreloaderSharedHelpers
 	extend self
 
-	def init
+	def init(options)
 		if !Kernel.respond_to?(:fork)
 			message = "Smart spawning is not available on this Ruby " +
 				"implementation because it does not support `Kernel.fork`. "
@@ -42,6 +42,7 @@ module PreloaderSharedHelpers
 			end
 			raise(message)
 		end
+		return options
 	end
 	
 	def accept_and_process_next_client(server_socket)

data/lib/phusion_passenger/request_handler.rb

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2013 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -28,6 +28,7 @@ PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'public_api'
 PhusionPassenger.require_passenger_lib 'message_client'
 PhusionPassenger.require_passenger_lib 'debug_logging'
+PhusionPassenger.require_passenger_lib 'native_support'
 PhusionPassenger.require_passenger_lib 'utils'
 PhusionPassenger.require_passenger_lib 'utils/tmpdir'
 PhusionPassenger.require_passenger_lib 'ruby_core_enhancements'

data/lib/phusion_passenger/request_handler/thread_handler.rb

@@ -25,6 +25,7 @@ PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'debug_logging'
 PhusionPassenger.require_passenger_lib 'message_channel'
 PhusionPassenger.require_passenger_lib 'utils'
+PhusionPassenger.require_passenger_lib 'utils/native_support_utils'
 PhusionPassenger.require_passenger_lib 'utils/unseekable_socket'
 
 module PhusionPassenger
@@ -192,7 +193,7 @@ private
 		if headers_data.nil?
 			return
 		end
-		headers = Utils.split_by_null_into_hash(headers_data)
+		headers = Utils::NativeSupportUtils.split_by_null_into_hash(headers_data)
 		if @connect_password && headers[PASSENGER_CONNECT_PASSWORD] != @connect_password
 			warn "*** Passenger RequestHandler warning: " <<
 				"someone tried to connect with an invalid connect password."

data/lib/phusion_passenger/standalone/runtime_installer.rb

@@ -136,7 +136,7 @@ protected
 		@working_dir = PhusionPassenger::Utils.mktmpdir("passenger.", PlatformInfo.tmpexedir)
 		@nginx_version ||= PREFERRED_NGINX_VERSION
 		@download_binaries = true if !defined?(@download_binaries)
-		@binaries_url_root ||= BINARIES_URL_ROOT
+		@binaries_url_root ||= PhusionPassenger.binaries_sites
 	end
 
 	def after_install
@@ -233,9 +233,8 @@ private
 
 		puts " --> Downloading #{PROGRAM_NAME} support binaries for your platform"
 		basename = "support-#{PlatformInfo.cxx_binary_compatibility_id}.tar.gz"
-		url      = "#{@binaries_url_root}/#{PhusionPassenger::VERSION_STRING}/#{basename}"
 		tarball  = "#{@working_dir}/#{basename}"
-		if !download(url, tarball, :cacert => PhusionPassenger.binaries_ca_cert_path, :use_cache => true)
+		if !download_support_file(basename, tarball)
 			puts "     No binaries are available for your platform. Will compile them from source"
 			return false
 		end
@@ -278,16 +277,8 @@ private
 
 		puts " --> Downloading web helper for your platform"
 		basename = "webhelper-#{@nginx_version}-#{PlatformInfo.cxx_binary_compatibility_id}.tar.gz"
-		url      = "#{@binaries_url_root}/#{PhusionPassenger::VERSION_STRING}/#{basename}"
 		tarball  = "#{@working_dir}/#{basename}"
-		logger = Logger.new(STDOUT)
-		logger.level = Logger::WARN
-		logger.formatter = proc { |severity, datetime, progname, msg| "     #{msg}\n" }
-		result = download(url, tarball,
-			:cacert => PhusionPassenger.binaries_ca_cert_path,
-			:use_cache => true,
-			:logger => logger)
-		if !result
+		if !download_support_file(basename, tarball)
 			puts "     No binary is available for your platform. Will compile it from source."
 			return false
 		end
@@ -378,7 +369,7 @@ private
 	def compile_support_binaries
 		begin_progress_bar
 		show_progress(0, 1, 1, 1, "Preparing #{PROGRAM_NAME}...")
-		Dir.chdir(PhusionPassenger.source_root) do
+		Dir.chdir(PhusionPassenger.build_system_dir) do
 			args = "nginx_without_native_support" +
 				" CACHING=false" +
 				" OUTPUT_DIR='#{@support_dir}'"
@@ -542,6 +533,37 @@ private
 		end
 		return true
 	end
+
+	def download_support_file(name, output)
+		logger = Logger.new(STDOUT)
+		logger.level = Logger::WARN
+		logger.formatter = proc do |severity, datetime, progname, msg|
+			msg.gsub(/^/, "     ") + "\n"
+		end
+
+		if @binaries_url_root.is_a?(String)
+			sites = [{ :url => @binaries_url_root }]
+		else
+			sites = @binaries_url_root
+		end
+		sites.each_with_index do |site, i|
+			if real_download_support_file(site, name, output, logger)
+				logger.warn "Download OK!" if i > 0
+				return true
+			elsif i != sites.size - 1
+				logger.warn "Trying next mirror..."
+			end
+		end
+		return false
+	end
+
+	def real_download_support_file(site, name, output, logger)
+		url = "#{site[:url]}/#{VERSION_STRING}/#{name}"
+		return download(url, output,
+			:cacert => site[:cacert],
+			:logger => logger,
+			:use_cache => true)
+	end
 	
 	def run_command_with_throbber(command, status_text)
 		backlog = ""

data/lib/phusion_passenger/standalone/start_command.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2013 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -467,7 +467,7 @@ private
 	def ensure_runtime_installed
 		if @runtime_locator.everything_installed?
 			if !File.exist?(@runtime_locator.find_nginx_binary)
-				error "The Nginx binary '#{@runtime_locator.find_nginx_binary}' does not exist."
+				error "The web helper binary '#{@runtime_locator.find_nginx_binary}' does not exist."
 				exit 1
 			end
 		else

data/lib/phusion_passenger/utils.rb

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010, 2011, 2012 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -22,12 +22,6 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-begin
-	require 'rubygems'
-rescue LoadError
-end
-PhusionPassenger.require_passenger_lib 'native_support'
-
 module PhusionPassenger
 
 # Utility functions.
@@ -181,22 +175,6 @@ module Utils
 		return output
 	end
 	
-	if defined?(PhusionPassenger::NativeSupport)
-		# Split the given string into an hash. Keys and values are obtained by splitting the
-		# string using the null character as the delimitor.
-		def split_by_null_into_hash(data)
-			return PhusionPassenger::NativeSupport.split_by_null_into_hash(data)
-		end
-	else
-		NULL = "\0".freeze
-		
-		def split_by_null_into_hash(data)
-			args = data.split(NULL, -1)
-			args.pop
-			return Hash[*args]
-		end
-	end
-	
 	####################################
 end
 

data/lib/phusion_passenger/utils/ansi_colors.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -27,7 +27,9 @@ module Utils
 module AnsiColors
 	RESET    = "\e[0m".freeze
 	BOLD     = "\e[1m".freeze
+	DGRAY    = "\e[90m".freeze
 	RED      = "\e[31m".freeze
+	ORANGE   = "\e[38;5;214m".freeze
 	GREEN    = "\e[32m".freeze
 	YELLOW   = "\e[33m".freeze
 	WHITE    = "\e[37m".freeze
@@ -47,7 +49,9 @@ module AnsiColors
 	
 	def ansi_colorize(text)
 		text = text.gsub(%r{<b>(.*?)</b>}m, "#{BOLD}\\1#{DEFAULT_TERMINAL_COLOR}")
+		text.gsub!(%r{<dgray>(.*?)</dgray>}m, "#{BOLD}#{DGRAY}\\1#{DEFAULT_TERMINAL_COLOR}")
 		text.gsub!(%r{<red>(.*?)</red>}m, "#{BOLD}#{RED}\\1#{DEFAULT_TERMINAL_COLOR}")
+		text.gsub!(%r{<orange>(.*?)</orange>}m, "#{BOLD}#{ORANGE}\\1#{DEFAULT_TERMINAL_COLOR}")
 		text.gsub!(%r{<green>(.*?)</green>}m, "#{BOLD}#{GREEN}\\1#{DEFAULT_TERMINAL_COLOR}")
 		text.gsub!(%r{<yellow>(.*?)</yellow>}m, "#{BOLD}#{YELLOW}\\1#{DEFAULT_TERMINAL_COLOR}")
 		text.gsub!(%r{<banner>(.*?)</banner>}m, "#{BOLD}#{BLUE_BG}#{YELLOW}\\1#{DEFAULT_TERMINAL_COLOR}")
@@ -56,7 +60,9 @@ module AnsiColors
 
 	def strip_color_tags(text)
 		text = text.gsub(%r{<b>(.*?)</b>}m, "\\1")
+		text = text.gsub(%r{<dgray>(.*?)</dgray>}m, "\\1")
 		text.gsub!(%r{<red>(.*?)</red>}m, "\\1")
+		text.gsub!(%r{<orange>(.*?)</orange>}m, "\\1")
 		text.gsub!(%r{<green>(.*?)</green>}m, "\\1")
 		text.gsub!(%r{<yellow>(.*?)</yellow>}m, "\\1")
 		text.gsub!(%r{<banner>(.*?)</banner>}m, "\\1")