passenger 4.0.20 → 4.0.21

data/lib/phusion_passenger.rb

@@ -26,14 +26,14 @@ module PhusionPassenger
 	FILE_LOCATION = File.expand_path(__FILE__)
 	
 	
-	###### Version numbers ######
+	###### Names and version numbers ######
 	
 	PACKAGE_NAME = 'passenger'
 	# Run 'rake ext/common/Constants.h' after changing this number.
-	VERSION_STRING = '4.0.20'
+	VERSION_STRING = '4.0.21'
 	
-	PREFERRED_NGINX_VERSION = '1.4.2'
-	NGINX_SHA256_CHECKSUM = '5361ffb7b0ebf8b1a04369bc3d1295eaed091680c1c58115f88d56c8e51f3611'
+	PREFERRED_NGINX_VERSION = '1.4.3'
+	NGINX_SHA256_CHECKSUM = 'ae123885c923a6c3f5bab0a8b7296ef21c4fdf6087834667ebbc16338177de84'
 
 	PREFERRED_PCRE_VERSION  = '8.32'
 	PCRE_SHA256_CHECKSUM = 'd5d8634b36baf3d08be442a627001099583b397f456bc795304a013383b6423a'
@@ -63,6 +63,7 @@ module PhusionPassenger
 		:include_dir,
 		:doc_dir,
 		:ruby_libdir,
+		:node_libdir,
 		:apache2_module_path,
 		:ruby_extension_source_dir,
 		:nginx_module_source_dir
@@ -100,6 +101,7 @@ module PhusionPassenger
 			@include_dir           = "#{@source_root}/ext".freeze
 			@doc_dir               = "#{@source_root}/doc".freeze
 			@ruby_libdir           = File.dirname(FILE_LOCATION)
+			@node_libdir           = "#{@source_root}/node_lib".freeze
 			@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"
@@ -147,11 +149,31 @@ module PhusionPassenger
 		}
 	end
 	eval(getters_code, binding, __FILE__, __LINE__)
+
+	def self.index_doc_path
+		return "#{doc_dir}/#{INDEX_DOC_NAME}"
+	end
+
+	def self.apache2_doc_path
+		return "#{doc_dir}/#{APACHE2_DOC_NAME}"
+	end
+
+	def self.nginx_doc_path
+		return "#{doc_dir}/#{NGINX_DOC_NAME}"
+	end
+
+	def self.standalone_doc_path
+		return "#{doc_dir}/#{STANDALONE_DOC_NAME}"
+	end
 	
 	
 	###### Other resource locations ######
 	
-	BINARIES_URL_ROOT  = "https://oss-binaries.phusionpassenger.com/binaries/passenger/by_release"
+	BINARIES_URL_ROOT   = "https://oss-binaries.phusionpassenger.com/binaries/passenger/by_release"
+	INDEX_DOC_NAME      = "Users guide.html"
+	APACHE2_DOC_NAME    = "Users guide Apache.html"
+	NGINX_DOC_NAME      = "Users guide Nginx.html"
+	STANDALONE_DOC_NAME = "Users guide Standalone.html"
 
 	def self.binaries_ca_cert_path
 		return "#{resources_dir}/oss-binaries.phusionpassenger.com.crt"

data/lib/phusion_passenger/abstract_installer.rb

@@ -28,6 +28,7 @@ require 'phusion_passenger/platform_info'
 require 'phusion_passenger/platform_info/operating_system'
 require 'phusion_passenger/utils/ansi_colors'
 require 'fileutils'
+require 'etc'
 
 # 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
@@ -70,12 +71,17 @@ class AbstractInstaller
 	rescue Abort
 		puts
 		return false
+	rescue SignalException, SystemExit
+		raise
 	rescue PlatformInfo::RuntimeError => e
 		new_screen
 		puts "<red>An error occurred</red>"
 		puts
 		puts e.message
 		exit 1
+	rescue Exception => e
+		show_support_options_for_installer_bug(e)
+		exit 2
 	ensure
 		after_install
 	end
@@ -106,6 +112,14 @@ protected
 		STDOUT.write(Utils::AnsiColors::RESET)
 		STDOUT.flush
 	end
+
+	def users_guide_path
+		return PhusionPassenger.index_doc_path
+	end
+
+	def users_guide_url
+		return INDEX_DOC_URL
+	end
 	
 	def dependencies
 		return [[], []]
@@ -149,12 +163,11 @@ protected
 				puts "   #{dep.install_instructions}"
 				puts
 			end
-			if respond_to?(:users_guide)
-				puts "If the aforementioned instructions didn't solve your problem, then please take"
-				puts "a look at the Users Guide:"
-				puts
-				puts "  <yellow>#{users_guide}</yellow>"
-			end
+			puts "If the aforementioned instructions didn't solve your problem, then please take"
+			puts "a look at the Users Guide:"
+			puts
+			puts "  <yellow>#{users_guide_path}</yellow>"
+			puts "  <yellow>#{users_guide_url}</yellow>"
 			return false
 		end
 	end
@@ -163,6 +176,42 @@ protected
 		# No known broken OSes at the moment.
 	end
 
+	def check_gem_install_permission_problems
+		return true if PhusionPassenger.natively_packaged?
+		begin
+			require 'rubygems'
+		rescue LoadError
+			return true
+		end
+
+		if Process.uid != 0 &&
+		   PhusionPassenger.source_root =~ /^#{Regexp.escape home_dir}\// &&
+		   PhusionPassenger.source_root =~ /^#{Regexp.escape Gem.dir}\// &&
+		   File.stat(PhusionPassenger.source_root).uid == 0
+			new_screen
+			render_template 'installer_common/gem_install_permission_problems'
+			return false
+		else
+			return true
+		end
+	end
+
+	def check_directory_accessible_by_web_server
+		return true if PhusionPassenger.natively_packaged?
+		inaccessible_directories = []
+		list_parent_directories(PhusionPassenger.source_root).each do |path|
+			if !world_executable?(path)
+				inaccessible_directories << path
+			end
+		end
+		if !inaccessible_directories.empty?
+			new_screen
+			render_template 'installer_common/world_inaccessible_directories',
+				:directories => inaccessible_directories
+			wait
+		end
+	end
+
 	def check_whether_system_has_enough_ram(required = 1024)
 		begin
 			meminfo = File.read("/proc/meminfo")
@@ -186,16 +235,39 @@ protected
 				:current => ram_mb + swap_mb,
 				:ram => ram_mb,
 				:swap => swap_mb,
-				:doc => users_guide
+				:doc_path => users_guide_path,
+				:doc_url => users_guide_url
 			wait
 		end
 	end
+
+	def show_support_options_for_installer_bug(e)
+		# We do not use template rendering here. Since we've determined that there's
+		# a bug, *anything* may be broken, so we use the safest codepath to ensure that
+		# the user sees the proper messages.
+		begin
+			line
+			@stderr.puts "*** EXCEPTION: #{e} (#{e.class})\n    " +
+				e.backtrace.join("\n    ")
+			new_screen
+			puts '<red>Oops, something went wrong :-(</red>'
+			puts
+			puts "We're sorry, but it looks like this installer ran into an unexpected problem.\n" +
+				"Please visit the following website for support. We'll do our best to help you.\n\n" +
+				"  <b>#{SUPPORT_URL}</b>\n\n" +
+				"When submitting a support inquiry, please copy and paste the entire installler\n" +
+				"output."
+		rescue Exception => e2
+			# Raise original exception so that it doesn't get lost.
+			raise e
+		end
+	end
 	
 	
 	def use_stderr
 		old_stdout = @stdout
 		begin
-			@stdout = STDERR
+			@stdout = @stderr
 			yield
 		ensure
 			@stdout = old_stdout
@@ -209,7 +281,7 @@ protected
 	
 	def puts(text = nil)
 		if text
-			@stdout.puts(Utils::AnsiColors.ansi_colorize(text))
+			@stdout.puts(Utils::AnsiColors.ansi_colorize(text.to_s))
 		else
 			@stdout.puts
 		end
@@ -299,6 +371,10 @@ protected
 	rescue Interrupt
 		raise Abort
 	end
+
+	def home_dir
+		Etc.getpwuid(Process.uid).dir
+	end
 	
 	
 	def sh(*args)
@@ -362,6 +438,25 @@ protected
 			return sh("curl", url, "-f", "-L", "-o", output, *args)
 		end
 	end
+
+	def list_parent_directories(dir)
+		dirs = []
+		components = File.expand_path(dir).split(File::SEPARATOR)
+		components.shift # Remove leading /
+		components.size.times do |i|
+			dirs << File::SEPARATOR + components[0 .. i].join(File::SEPARATOR)
+		end
+		return dirs.reverse
+	end
+
+	def world_executable?(dir)
+		begin
+			stat = File.stat(dir)
+		rescue Errno::EACCESS
+			return false
+		end
+		return stat.mode & 0000001 != 0
+	end
 end
 
 end # module PhusionPassenger

data/lib/phusion_passenger/admin_tools/memory_stats.rb

@@ -22,6 +22,7 @@
 #  THE SOFTWARE.
 
 require 'phusion_passenger/platform_info/apache'
+require 'phusion_passenger/platform_info/operating_system'
 
 module PhusionPassenger
 module AdminTools
@@ -115,7 +116,7 @@ class MemoryStats
 	end
 	
 	def platform_provides_private_dirty_rss_information?
-		return ruby_platform =~ /linux/
+		return os_name == "linux"
 	end
 	
 	# Returns whether root privileges are required in order to measure private dirty RSS.
@@ -135,7 +136,7 @@ class MemoryStats
 	# if the system's RAM usage cannot be determined.
 	def system_ram_usage
 		@total_system_ram ||= begin
-			case ruby_platform
+			case os_name
 			when /linux/
 				free_text = `free -k`
 				
@@ -148,7 +149,7 @@ class MemoryStats
 				used = line.split(/ +/).first.to_i
 				
 				[total, used]
-			when /darwin/
+			when /macosx/
 				vm_stat = `vm_stat`
 				vm_stat =~ /page size of (\d+) bytes/
 				page_size = $1
@@ -199,8 +200,8 @@ class MemoryStats
 	end
 
 private
-	def ruby_platform
-		return RUBY_PLATFORM
+	def os_name
+		return PlatformInfo.os_name
 	end
 	
 	# Returns a list of Process objects that match the given search criteria.
@@ -216,14 +217,14 @@ private
 	def list_processes(options)
 		if options[:exe]
 			name = options[:exe].sub(/.*\/(.*)/, '\1')
-			if ruby_platform =~ /linux/
+			if os_name =~ /linux/
 				ps = "ps -C '#{name}'"
 			else
 				ps = "ps -A"
 				options[:match] = Regexp.new(Regexp.escape(name))
 			end
 		elsif options[:name]
-			if ruby_platform =~ /linux/
+			if os_name =~ /linux/
 				ps = "ps -C '#{options[:name]}'"
 			else
 				ps = "ps -A"
@@ -236,11 +237,11 @@ private
 		end
 		
 		processes = []
-		case RUBY_PLATFORM
+		case os_name
 		when /solaris/
 			list = `#{ps} -o pid,ppid,nlwp,vsz,rss,pcpu,comm`.split("\n")
 			threads_known = true
-		when /darwin/
+		when /macosx/
 			list = `#{ps} -w -o pid,ppid,vsz,rss,%cpu,command`.split("\n")
 			threads_known = false
 		else

data/lib/phusion_passenger/apache2/config_options.rb

@@ -47,7 +47,8 @@ APACHE2_DIRECTORY_CONFIGURATION_OPTIONS = [
 	{
 		:name => "PassengerRuby",
 		:type => :string,
-		:desc => "The Ruby interpreter to use."
+		:desc => "The Ruby interpreter to use.",
+		:header_expression => "config->ruby ? config->ruby : serverConfig.defaultRuby"
 	},
 	{
 		:name => "PassengerMinInstances",
@@ -86,13 +87,15 @@ APACHE2_DIRECTORY_CONFIGURATION_OPTIONS = [
 		:name => "PassengerHighPerformance",
 		:type => :flag,
 		:context => ["OR_ALL"],
-		:desc => "Enable or disable Passenger's high performance mode."
+		:desc    => "Enable or disable Passenger's high performance mode.",
+		:header  => nil
 	},
 	{
 		:name => "PassengerEnabled",
 		:type => :flag,
 		:context => ["OR_ALL"],
-		:desc => "Enable or disable Phusion Passenger."
+		:desc    => "Enable or disable Phusion Passenger.",
+		:header  => nil
 	},
 	{
 		:name => "PassengerMaxRequestQueueSize",

data/lib/phusion_passenger/common_library.rb

@@ -102,7 +102,7 @@ class CommonLibraryBuilder
 
 	def define_tasks(extra_compiler_flags = nil)
 		flags =  "-Iext -Iext/common #{LIBEV_CFLAGS} #{extra_compiler_flags} "
-		flags << "#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
+		flags << EXTRA_CXXFLAGS
 		flags.strip!
 
 		group_all_components_by_category.each_pair do |category, object_names|
@@ -320,6 +320,12 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
 			Logging.cpp
 			Logging.h
 		)
+	define_component 'Exceptions.o',
+		:source   => 'Exceptions.cpp',
+		:category => :base,
+		:deps     => %w(
+			Exceptions.h
+		)
 	define_component 'Utils/SystemTime.o',
 		:source   => 'Utils/SystemTime.cpp',
 		:category => :base,

data/lib/phusion_passenger/constants.rb

@@ -68,6 +68,12 @@ module PhusionPassenger
 
 		# Misc
 		FEEDBACK_FD = 3
+		PROGRAM_NAME = "Phusion Passenger"
+		INDEX_DOC_URL       = "http://www.modrails.com/documentation/Users%20guide.html"
+		APACHE2_DOC_URL     = "http://www.modrails.com/documentation/Users%20guide%20Apache.html"
+		NGINX_DOC_URL       = "http://www.modrails.com/documentation/Users%20guide%20Nginx.html"
+		STANDALONE_DOC_URL  = "http://www.modrails.com/documentation/Users%20guide%20Standalone.html"
+		SUPPORT_URL         = "http://www.phusionpassenger.com/support"
 		STANDALONE_NGINX_CONFIGURE_OPTIONS =
 			"--with-cc-opt='-Wno-error' " <<
 			"--without-http_fastcgi_module " <<

data/lib/phusion_passenger/loader_shared_helpers.rb

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2011, 2012 Phusion
+#  Copyright (c) 2011-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -332,15 +332,18 @@ private
 	def running_bundler
 		yield
 	rescue Exception => e
-		if defined?(Bundler::GemNotFound) && e.is_a?(Bundler::GemNotFound)
+		if (defined?(Bundler::GemNotFound) && e.is_a?(Bundler::GemNotFound)) ||
+		   (defined?(Bundler::GitError) && e.is_a?(Bundler::GitError))
 			prepend_exception_comment(e, "It looks like Bundler could not find a gem. This " +
 				"is probably because your\n" +
 				"application is being run under a different environment than it's supposed to.\n" +
 				"Please check the following:\n\n" +
 				" * Is this app supposed to be run as the `#{whoami}` user?\n" +
 				" * Is this app being run on the correct Ruby interpreter? Below you will\n" +
-				"   see which Ruby interpreter Phusion Passenger attempted to use. If you \n" +
-				"   are using RVM, please also check whether the correct gemset is being used.\n")
+				"   see which Ruby interpreter Phusion Passenger attempted to use.\n" +
+				" * Are you using RVM? Please check whether the correct gemset is being used.\n" +
+				" * If all of the above fails, try resetting your RVM gemsets:\n" +
+				"   https://github.com/phusion/passenger/wiki/Resetting-RVM-gemsets\n")
 		end
 		raise e
 	end

data/lib/phusion_passenger/nginx/config_options.rb

@@ -42,7 +42,7 @@
 #  * context - The context in which this configuration option is valid.
 #              Defaults to [:main, :srv, :loc, :lif]
 #  * type - This configuration option's value type. Allowed types:
-#           :string, :integer, :flag, :string_array, :string_keyval
+#           :string, :integer, :flag, :string_array, :string_keyval, :path
 #  * take - Tells Nginx how many parameters and what kind of parameter
 #           this configuration option takes. It should be set to a string
 #           such as "NGX_CONF_FLAG".
@@ -182,6 +182,7 @@ LOCATION_CONFIGURATION_OPTIONS = [
 	},
 	{
 		:name   => 'passenger_set_cgi_param',
+		:context => [:srv, :loc, :lif],
 		:type   => :string_keyval,
 		:field  => 'vars_source',
 		:header => nil,

data/lib/phusion_passenger/packaging.rb

@@ -26,6 +26,7 @@ module PhusionPassenger
 module Packaging
 	# A list of HTML files that are generated with Asciidoc.
 	ASCII_DOCS = [
+		'doc/Users guide.html',
 		'doc/Users guide Apache.html',
 		'doc/Users guide Nginx.html',
 		'doc/Users guide Standalone.html',
@@ -80,6 +81,7 @@ module Packaging
 		'lib/*.rb',
 		'lib/**/*.rb',
 		'lib/**/*.py',
+		'node_lib/**/*.js',
 		'bin/*',
 		'doc/**/*',
 		'man/*',
@@ -115,6 +117,7 @@ module Packaging
 		'test/cxx/**/*.{cpp,h}',
 		'test/oxt/*.{cpp,hpp}',
 		'test/ruby/**/*',
+		'test/node/**/*',
 		'test/integration_tests/**/*',
 		'test/stub/**/*',
 		'test/stub/**/.*'