passenger 4.0.5 → 4.0.6

data/lib/phusion_passenger/packaging.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.
 #
@@ -58,6 +58,7 @@ module Packaging
 		'configure',
 		'Rakefile',
 		'README.md',
+		'CONTRIBUTORS',
 		'CONTRIBUTING.md',
 		'LICENSE',
 		'INSTALL.md',
@@ -70,7 +71,7 @@ module Packaging
 		'bin/*',
 		'doc/**/*',
 		'man/*',
-		'debian/*',
+		'debian.template/**/*',
 		'helper-scripts/*',
 		'ext/common/**/*.{cpp,c,h,hpp,md,erb}',
 		'ext/apache2/*.{cpp,h,hpp,c}',
@@ -107,6 +108,19 @@ module Packaging
 		'test/stub/rails_apps/3.0/empty/help/**/*',
 		'test/stub/*.dSYM'
 	]
+
+	# Files that should be excluded from the Debian tarball.
+	DEBIAN_EXCLUDE_GLOB = [
+		"debian.template/**/*",
+	]
+
+	def self.files
+		return Dir[*GLOB] - Dir[*EXCLUDE_GLOB]
+	end
+
+	def self.debian_orig_tarball_files
+		return files - Dir[*DEBIAN_EXCLUDE_GLOB]
+	end
 end
 
 end # module PhusionPassenger

data/lib/phusion_passenger/platform_info/binary_compatibility.rb

@@ -29,13 +29,13 @@ require 'phusion_passenger/platform_info/operating_system'
 module PhusionPassenger
 
 module PlatformInfo
-	# Returns an array of identifiers that describe the current Ruby
+	# Returns a string that describes the current Ruby
 	# interpreter's extension binary compatibility. A Ruby extension
 	# compiled for a certain Ruby interpreter can also be loaded on
 	# a different Ruby interpreter with the same binary compatibility
-	# identifiers.
+	# identifier.
 	#
-	# The identifiers depend on the following factors:
+	# The result depends on the following factors:
 	# - Ruby engine name.
 	# - Ruby extension version.
 	#   This is not the same as the Ruby language version, which
@@ -89,7 +89,7 @@ module PlatformInfo
 	# Returns an identifier string that describes the current
 	# 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.
+	# identifiers should be able to run the same C/C++ binaries.
 	#
 	# The the string depends on the following factors:
 	# - The operating system name.
@@ -128,35 +128,10 @@ module PlatformInfo
 			end
 		else
 			os_arch = cpu_architectures[0]
-			
-			cpp = find_command('cpp')
-			if cpp
-				macros = `#{cpp} -dM < /dev/null`
-				
-				# Can be something like "4.3.2"
-				# or "4.2.1 20070719 (FreeBSD)"
-				macros =~ /__VERSION__ "(.+)"/
-				compiler_version = $1
-				compiler_version.gsub!(/ .*/, '') if compiler_version
-				
-				macros =~ /__GXX_ABI_VERSION (.+)$/
-				cxx_abi_version = $1
-			else
-				compiler_version = nil
-				cxx_abi_version = nil
-			end
-			
-			if compiler_version && cxx_abi_version
-				os_runtime = "gcc#{compiler_version}-#{cxx_abi_version}"
-			else
-				os_runtime = [compiler_version, cxx_abi_version].compact.join("-")
-				if os_runtime.empty?
-					os_runtime = `uname -r`.strip
-				end
-			end
+			os_runtime = nil
 		end
 		
-		return "#{os_arch}-#{os_name}-#{os_runtime}"
+		return [os_arch, os_name, os_runtime].compact.join("-")
 	end
 	memoize :cxx_binary_compatibility_id
 end

data/lib/phusion_passenger/platform_info/operating_system.rb

@@ -33,7 +33,7 @@ module PlatformInfo
 		if rb_config['target_os'] =~ /darwin/ && (sw_vers = find_command('sw_vers'))
 			return "macosx"
 		else
-			return RUBY_PLATFORM.sub(/.*?-/, '')
+			return rb_config['target_os']
 		end
 	end
 	memoize :os_name

data/lib/phusion_passenger/preloader_shared_helpers.rb

@@ -71,8 +71,10 @@ module PreloaderSharedHelpers
 				client.flush
 				client.sync = true
 				return [:forked, client]
-			else
+			elsif defined?(NativeSupport)
 				NativeSupport.detach_process(pid)
+			else
+				Process.detach(pid)
 			end
 		else
 			STDERR.puts "Unknown command '#{command.inspect}'"

data/lib/phusion_passenger/request_handler.rb

@@ -262,7 +262,7 @@ class RequestHandler
 			if @detach_key && @pool_account_username && @pool_account_password
 				client = MessageClient.new(@pool_account_username, @pool_account_password)
 				begin
-					client.detach(@detach_key)
+					client.pool_detach_process_by_key(@detach_key)
 				ensure
 					client.close
 				end

data/lib/phusion_passenger/standalone/command.rb

@@ -36,7 +36,8 @@ class Command
 		:max_pool_size => 6,
 		:min_instances => 1,
 		:spawn_method  => Kernel.respond_to?(:fork) ? 'smart' : 'direct',
-		:nginx_version => PREFERRED_NGINX_VERSION
+		:nginx_version => PREFERRED_NGINX_VERSION,
+		:friendly_error_pages => true
 	}.freeze
 	
 	include Utils
@@ -181,9 +182,8 @@ private
 	def write_nginx_config_file
 		require 'phusion_passenger/platform_info/ruby'
 		require 'phusion_passenger/utils/tmpio'
-		@temp_dir        = PhusionPassenger::Utils.mktmpdir(
-			"passenger.#{SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION}.#{SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION}.",
-			"/tmp")
+		@temp_dir = PhusionPassenger::Utils.mktmpdir(
+			"passenger-standalone.")
 		@config_filename = "#{@temp_dir}/config"
 		location_config_filename = "#{@temp_dir}/locations.ini"
 		File.chmod(0755, @temp_dir)
@@ -195,14 +195,14 @@ private
 			if debugging?
 				f.puts "agents=#{PhusionPassenger.agents_dir}"
 			else
-				f.puts "agents=#{@runtime_dirs[:support_dir]}"
+				f.puts "agents=#{@runtime_dirs[:support_dir]}/agents"
 			end
 			f.puts "libdir=#{PhusionPassenger.lib_dir}"
 			f.puts "helper_scripts=#{PhusionPassenger.helper_scripts_dir}"
 			f.puts "resources=#{PhusionPassenger.resources_dir}"
 			f.puts "includedir=#{PhusionPassenger.include_dir}"
 			f.puts "doc=#{PhusionPassenger.doc_dir}"
-			f.puts "rubylib=#{PhusionPassenger.ruby_libdir}"
+			f.puts "rubylibdir=#{PhusionPassenger.ruby_libdir}"
 			f.puts "apache2_module=#{PhusionPassenger.apache2_module_path}"
 			f.puts "ruby_extension_source=#{PhusionPassenger.ruby_extension_source_dir}"
 		end

data/lib/phusion_passenger/standalone/main.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -82,18 +82,33 @@ class Main
 
 private
 	def command_exists?(name)
-		return COMMANDS.any? do |element|
-			element[0] == name
-		end
+		return !!find_command_spec(name)
 	end
 	
 	def run_command(name, args = [])
-		Main.each_command do |command_name, command_class|
-			if command_name == name
-				return command_class.new(args).run
+		if spec = find_command_spec(name)
+			klass = get_command_class(spec)
+			klass.require_libs if klass.respond_to?(:require_libs)
+			klass.new(args).run
+		else
+			raise ArgumentError, "Command '#{name}' doesn't exist"
+		end
+	end
+
+	def find_command_spec(name)
+		COMMANDS.each do |spec|
+			if spec[0] == name
+				return spec
 			end
 		end
-		raise ArgumentError, "Command '#{name}' doesn't exist"
+		return nil
+	end
+
+	def get_command_class(spec)
+		command_name, class_name = spec
+		filename = command_name.sub(/-/, '_') + "_command"
+		require "phusion_passenger/standalone/#{filename}"
+		return Standalone.const_get(class_name)
 	end
 end
 

data/lib/phusion_passenger/standalone/package_runtime_command.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
@@ -20,7 +21,6 @@
 #  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
-require 'phusion_passenger/standalone/command'
 
 module PhusionPassenger
 module Standalone
@@ -29,9 +29,13 @@ class PackageRuntimeCommand < Command
 	def self.description
 		return "Package the Phusion Passenger Standalone runtime."
 	end
-	
+
+	def self.require_libs
+		require 'phusion_passenger/platform_info/binary_compatibility'
+		require 'phusion_passenger/standalone/runtime_installer'
+	end
+
 	def run
-		require_platform_info_binary_compatibility
 		destdir = File.expand_path("passenger-standalone")
 		description =
 			"Package the Phusion Passenger Standalone runtime into the specified directory.\n" <<
@@ -42,7 +46,8 @@ class PackageRuntimeCommand < Command
 				@options[:nginx_version] = value
 			end
 			opts.on("--nginx-tarball FILENAME", String,
-				wrap_desc("Use the given tarball instead of downloading from the Internet")) do |value|
+				wrap_desc("Use the given tarball instead of downloading from the Internet. " +
+					"This tarball *must* match the version specified by --nginx-version!")) do |value|
 				@options[:nginx_tarball] = value
 			end
 		end
@@ -56,7 +61,6 @@ class PackageRuntimeCommand < Command
 		sh "rm", "-rf", support_dir
 		sh "rm", "-rf", nginx_dir
 		
-		require 'phusion_passenger/standalone/runtime_installer'
 		installer = RuntimeInstaller.new(
 			:targets     => [:nginx, :ruby, :support_binaries],
 			:support_dir => support_dir,

data/lib/phusion_passenger/standalone/runtime_installer.rb

@@ -119,6 +119,8 @@ protected
 			show_welcome_screen
 		end
 		check_dependencies(false) || exit(1)
+		check_whether_os_is_broken
+		check_whether_system_has_enough_ram
 		puts
 		
 		phase = 1
@@ -224,8 +226,8 @@ private
 	
 	def binary_support_files_should_be_installed?
 		return @targets.include?(:support_binaries) && (
-			!File.exist?("#{@support_dir}/agents/PassengerHelperAgent") ||
-			!File.exist?("#{@support_dir}/libout/common/libpassenger_common.a")
+			!File.exist?("#{@support_dir}/buildout/agents/PassengerHelperAgent") ||
+			!File.exist?("#{@support_dir}/buildout/common/libpassenger_common.a")
 		)
 	end
 	
@@ -487,16 +489,13 @@ private
 		Dir.chdir(PhusionPassenger.source_root) do
 			args = "nginx_without_native_support" +
 				" CACHING=false" +
-				" OUTPUT_DIR='#{@support_dir}'" +
-				" AGENT_OUTPUT_DIR='#{@support_dir}'" +
-				" COMMON_OUTPUT_DIR='#{@support_dir}'" +
-				" LIBEV_OUTPUT_DIR='#{@support_dir}/libev'" +
-				" LIBEIO_OUTPUT_DIR='#{@support_dir}/libeio'"
+				" OUTPUT_DIR='#{@support_dir}'"
 			run_rake_task!(args) do |progress, total|
 				yield(progress, total, 1, "Compiling Phusion Passenger...")
 			end
 
-			system "rm -rf '#{@support_dir}'/{*.o,*.dSYM,libboost_oxt}"
+			system "rm -rf '#{@support_dir}'/agents/{*.o,*.dSYM}"
+			system "rm -rf '#{@support_dir}'/common/libboost_oxt"
 			system "rm -rf '#{@support_dir}'/*/{*.lo,*.h,*.log,Makefile,libtool,stamp-h1,config.status,.deps}"
 			system "rm -rf '#{@support_dir}'/{libeio,libev}/*.o"
 			
@@ -521,9 +520,9 @@ private
 			command = ""
 			if @targets.include?(:support_binaries)
 				if ENV['PASSENGER_DEBUG'] && !ENV['PASSENGER_DEBUG'].empty?
-					output_dir = "#{PhusionPassenger.source_root}/libout/common/libpassenger_common"
+					output_dir = "#{PhusionPassenger.source_root}/buildout/common/libpassenger_common"
 				else
-					output_dir = "#{@support_dir}/libpassenger_common"
+					output_dir = "#{@support_dir}/common/libpassenger_common"
 				end
 				nginx_libs = COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).
 					set_output_dir(output_dir).

data/lib/phusion_passenger/standalone/start_command.rb

@@ -82,6 +82,7 @@ class StartCommand < Command
 			@plugin.call_hook(:nginx_started, @nginx)
 			########################
 			########################
+			touch_temp_dir_in_background
 			watch_log_files_in_background if should_watch_logs?
 			wait_until_nginx_has_exited
 		rescue Interrupt
@@ -162,6 +163,10 @@ private
 				wrap_desc("Enable deployment error resistance (Enterprise only)")) do
 				@options[:resist_deployment_errors] = true
 			end
+			opts.on("--no-friendly-error-pages",
+				wrap_desc("Disable passenger_friendly_error_pages")) do
+				@options[:friendly_error_pages] = false
+			end
 			opts.on("--union-station-gateway HOST:PORT", String,
 				wrap_desc("Specify Union Station Gateway host and port")) do |value|
 				host, port = value.split(":", 2)
@@ -368,7 +373,7 @@ private
 			:nginx_tarball     => @options[:nginx_tarball],
 			:binaries_url_root => @options[:binaries_url_root],
 			:plugin      => @plugin)
-		installer.run
+		return installer.run
 	end
 
 	def determine_runtime_dirs
@@ -392,7 +397,7 @@ private
 			:ruby_dir => "#{root}/rubyext-#{PlatformInfo.ruby_extension_binary_compatibility_id}",
 			:nginx_installed => File.exist?(nginx_bin)
 		}
-		result[:support_dir_installed] = File.exist?(result[:support_dir] + "/PassengerWatchdog")
+		result[:support_dir_installed] = File.exist?(result[:support_dir] + "/agents/PassengerWatchdog")
 		result[:everything_installed] = result[:nginx_installed] && result[:support_dir_installed]
 		return result
 	end
@@ -406,8 +411,8 @@ private
 			if !@runtime_dirs[:nginx_installed] && @options[:nginx_bin]
 				error "The given Nginx binary '#{@options[:nginx_bin]}' does not exist."
 				exit 1
-			else
-				install_runtime(@runtime_dirs)
+			elsif !install_runtime(@runtime_dirs)
+				exit 1
 			end
 		end
 	end
@@ -526,6 +531,17 @@ private
 		@interruptable_threads << thread
 	end
 
+	def touch_temp_dir_in_background
+		@interruptable_threads << Thread.new do
+			while true
+				# Touch the temp dir every 30 minutes to prevent
+				# /tmp cleaners from removing it.
+				sleep 60 * 30
+				system("find '#{@temp_dir}' | xargs touch")
+			end
+		end
+	end
+
 	def wait_until_nginx_has_exited
 		# Since Nginx is not our child process (it daemonizes or we daemonize)
 		# we cannot use Process.waitpid to wait for it. A busy-sleep-loop with

data/resources/templates/installer_common/freebsd9_broken_cxx_runtime.txt.erb

@@ -0,0 +1,19 @@
+<red>WARNING:</red> <yellow>You may need to upgrade FreeBSD</yellow>
+
+There is a bug in the C++ runtime in FreeBSD 9.1-RELEASE. This bug breaks
+Phusion Passenger. At the time this message was written, the bug had already
+been fixed in the stable/9 Subversion branch of FreeBSD. The fix will be
+included in FreeBSD 9.2. If FreeBSD 9.2 is already out, please upgrade to
+FreeBSD 9.2. Otherwise, please upgrade to the stable/9 branch according to the
+upgrade instructions in the FreeBSD Handbook:
+
+   http://www.freebsd.org/doc/handbook/current-stable.html#stable
+
+More information about the bug:
+
+   http://lists.freebsd.org/pipermail/freebsd-toolchain/2013-January/000692.html
+
+If you have already upgraded, please ignore this message and continue.
+
+<b>Press Ctrl-C to abort this installer (recommended).</b>
+<b>Press Enter if you want to continue with installation anyway.</b>

data/resources/templates/installer_common/low_amount_of_memory_warning.txt.erb

@@ -0,0 +1,22 @@
+<banner>Your system does not have a lot of virtual memory</banner>
+
+Compiling Phusion Passenger works best when you have at least <%= @required %> MB of virtual
+memory. However your system only has <%= @current %> MB of total virtual memory (<%= @ram %> MB
+RAM, <%= @swap %> MB swap). It is recommended that you temporarily add more swap space
+before proceeding. You can do it as follows:
+
+  <b>sudo dd if=/dev/zero of=/swap bs=1M count=1024
+  sudo mkswap /swap
+  sudo swapon /swap</b>
+
+See also <b>https://wiki.archlinux.org/index.php/Swap</b> for more information about
+the swap file on Linux.
+
+If you cannot activate a swap file (e.g. because you're on OpenVZ, or if you
+don't have root privileges) then you should install Phusion Passenger through
+DEB/RPM packages. Please refer to the manual for more information:
+<b><%= @doc %></b>, section
+"Installation".
+
+<b>Press Ctrl-C to abort this installer (recommended).</b>
+<b>Press Enter if you want to continue with installation anyway.</b>

data/resources/templates/standalone/config.erb

@@ -27,7 +27,6 @@ http {
     include '<%= PhusionPassenger.resources_dir %>/mime.types';
     passenger_ruby <%= PlatformInfo.ruby_command %>;
     passenger_root '<%= location_config_filename %>';
-    passenger_ctl server_instance_dir '<%= @temp_dir %>';
     passenger_abort_on_startup_error on;
     passenger_user_switching off;
     passenger_max_pool_size <%= @options[:max_pool_size] %>;
@@ -42,7 +41,9 @@ http {
     <% if debugging? %>passenger_log_level 2;<% end %>
     <% if @options[:rolling_restarts] %>passenger_rolling_restarts on;<% end %>
     <% if @options[:resist_deployment_errors] %>passenger_resist_deployment_errors on;<% end %>
-    
+
+    <% unless @options[:friendly_error_pages] %>passenger_friendly_error_pages off;<% end %>
+
     <% if @options[:union_station_gateway_address] %>
         union_station_gateway_address <%= @options[:union_station_gateway_address] %>;
         union_station_gateway_port <%= @options[:union_station_gateway_port] %>;