passenger 4.0.33 → 4.0.34

data/helper-scripts/classic-rails-preloader.rb

@@ -34,7 +34,12 @@ module App
 	def self.format_exception(e)
 		result = "#{e} (#{e.class})"
 		if !e.backtrace.empty?
-			result << "\n  " << e.backtrace.join("\n  ")
+			if e.respond_to?(:html?) && e.html?
+				require 'erb' if !defined?(ERB)
+				result << "\n<pre>  " << ERB::Util.h(e.backtrace.join("\n  ")) << "</pre>"
+			else
+				result << "\n  " << e.backtrace.join("\n  ")
+			end
 		end
 		return result
 	end
@@ -69,9 +74,8 @@ module App
 		PhusionPassenger.require_passenger_lib 'preloader_shared_helpers'
 		PhusionPassenger.require_passenger_lib 'loader_shared_helpers'
 		PhusionPassenger.require_passenger_lib 'request_handler'
-		LoaderSharedHelpers.init
-		PreloaderSharedHelpers.init
-		@@options = LoaderSharedHelpers.sanitize_spawn_options(@@options)
+		@@options = LoaderSharedHelpers.init(@@options)
+		@@options = PreloaderSharedHelpers.init(@@options)
 		Utils.passenger_tmpdir = options["generation_dir"]
 		if defined?(NativeSupport)
 			NativeSupport.disable_stdio_buffering
@@ -79,6 +83,7 @@ module App
 	rescue Exception => e
 		LoaderSharedHelpers.about_to_abort(e) if defined?(LoaderSharedHelpers)
 		puts "!> Error"
+		puts "!> html: true" if e.respond_to?(:html?) && e.html?
 		puts "!> "
 		puts format_exception(e)
 		exit exit_code_for_exception(e)
@@ -124,6 +129,7 @@ module App
 	rescue Exception => e
 		LoaderSharedHelpers.about_to_abort(e)
 		puts "!> Error"
+		puts "!> html: true" if e.respond_to?(:html?) && e.html?
 		puts "!> "
 		puts format_exception(e)
 		exit exit_code_for_exception(e)

data/helper-scripts/download_binaries/extconf.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  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.
 #
@@ -53,38 +53,62 @@ if !PhusionPassenger.installed_from_release_package?
 end
 
 # Create download directory and do some preparation
-require 'phusion_passenger/platform_info'
-require 'phusion_passenger/platform_info/binary_compatibility'
+PhusionPassenger.require_passenger_lib 'platform_info'
+PhusionPassenger.require_passenger_lib 'platform_info/binary_compatibility'
 cxx_compat_id = PhusionPassenger::PlatformInfo.cxx_binary_compatibility_id
 ruby_compat_id = PhusionPassenger::PlatformInfo.ruby_extension_binary_compatibility_id
 
+ABORT_ON_ERROR = ARGV[0] == "--abort-on-error"
+if url_root = ENV['BINARIES_URL_ROOT']
+	SITES = [{ :url => url_root }]
+else
+	SITES = PhusionPassenger.binaries_sites
+end
+
 FileUtils.mkdir_p(PhusionPassenger.download_cache_dir)
 Dir.chdir(PhusionPassenger.download_cache_dir)
 
 # Initiate downloads
 require 'phusion_passenger/utils/download'
 require 'logger'
-def download(name)
-	if !File.exist?(name)
-		url = "#{PhusionPassenger::BINARIES_URL_ROOT}/#{PhusionPassenger::VERSION_STRING}/#{name}"
-		cert = PhusionPassenger.binaries_ca_cert_path
-		puts "Attempting to download #{url} into #{Dir.pwd}"
-		File.unlink("#{name}.tmp") rescue nil
-		logger = Logger.new(STDOUT)
-		logger.level = Logger::WARN
-		logger.formatter = proc { |severity, datetime, progname, msg| "*** #{msg}\n" }
-		result = PhusionPassenger::Utils::Download.download(url, "#{name}.tmp",
-			:cacert => cert, :logger => logger)
-		if result
-			File.rename("#{name}.tmp", name)
-		else
-			File.unlink("#{name}.tmp") rescue nil
+
+def download(name, options = {})
+	if File.exist?(name)
+		puts "#{Dir.pwd}/#{name} already exists"
+		return true
+	end
+
+	logger = Logger.new(STDOUT)
+	logger.level = Logger::WARN
+	logger.formatter = proc { |severity, datetime, progname, msg| "*** #{msg}\n" }
+
+	SITES.each do |site|
+		if really_download(site, name, logger, options)
+			return true
 		end
+	end
+	abort "Cannot download #{name}, aborting" if ABORT_ON_ERROR
+	return false
+end
+
+def really_download(site, name, logger, options)
+	url = "#{site[:url]}/#{PhusionPassenger::VERSION_STRING}/#{name}"
+	puts "Attempting to download #{url} into #{Dir.pwd}"
+	File.unlink("#{name}.tmp") rescue nil
+	
+	options = {
+		:cacert => site[:cert],
+		:logger => logger
+	}.merge(options)
+	result = PhusionPassenger::Utils::Download.download(url, "#{name}.tmp", options)
+	if result
+		File.rename("#{name}.tmp", name)
 	else
-		puts "#{Dir.pwd}/#{name} already exists"
+		File.unlink("#{name}.tmp") rescue nil
 	end
+	return result
 end
 
-download "support-#{cxx_compat_id}.tar.gz"
-download "nginx-#{PhusionPassenger::PREFERRED_NGINX_VERSION}-#{cxx_compat_id}.tar.gz"
-download "rubyext-#{ruby_compat_id}.tar.gz"
+download "rubyext-#{ruby_compat_id}.tar.gz", :total_timeout => 10
+download "webhelper-#{PhusionPassenger::PREFERRED_NGINX_VERSION}-#{cxx_compat_id}.tar.gz", :total_timeout => 120
+download "support-#{cxx_compat_id}.tar.gz", :total_timeout => 900

data/helper-scripts/meteor-loader.rb

@@ -120,7 +120,6 @@ module App
 		end
 		puts "!> Ready"
 		puts "!> socket: main;tcp://127.0.0.1:#{port};http_session;0"
-		puts "!> pid: #{pid}"
 		puts "!> "
 		begin
 			STDIN.readline

data/helper-scripts/node-loader.js

@@ -32,7 +32,8 @@ var LineReader = require('phusion_passenger/line_reader').LineReader;
 var RequestHandler = require('phusion_passenger/request_handler').RequestHandler;
 var HttplibEmulation = require('phusion_passenger/httplib_emulation');
 
-GLOBAL.PhusionPassenger = new EventEmitter();
+module.isApplicationLoader = true; // https://groups.google.com/forum/#!topic/compoundjs/4txxkNtROQg
+GLOBAL.PhusionPassenger = exports.PhusionPassenger = new EventEmitter();
 var stdinReader = new LineReader(process.stdin);
 beginHandshake();
 readInitializationHeader();

data/helper-scripts/prespawn

@@ -27,6 +27,7 @@ STDERR.sync = true
 
 require 'uri'
 require 'socket'
+require 'timeout'
 
 class PrespawnLocation
 	class InvalidURLError < RuntimeError
@@ -92,7 +93,12 @@ class PrespawnLocation
 		socket.write("Connection: close\r\n")
 		socket.write("\r\n")
 
-		socket.read
+		begin
+			Timeout.timeout(10) do
+				socket.read
+			end
+		rescue Timeout::Error
+		end
 	end
 end
 

data/helper-scripts/rack-loader.rb

@@ -1,5 +1,28 @@
 #!/usr/bin/env ruby
 # encoding: binary
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2013 Phusion
+#
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  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.
+
 module PhusionPassenger
 module App
 	def self.options
@@ -13,7 +36,12 @@ module App
 	def self.format_exception(e)
 		result = "#{e} (#{e.class})"
 		if !e.backtrace.empty?
-			result << "\n  " << e.backtrace.join("\n  ")
+			if e.respond_to?(:html?) && e.html?
+				require 'erb' if !defined?(ERB)
+				result << "\n<pre>  " << ERB::Util.h(e.backtrace.join("\n  ")) << "</pre>"
+			else
+				result << "\n  " << e.backtrace.join("\n  ")
+			end
 		end
 		return result
 	end
@@ -48,8 +76,7 @@ module App
 		PhusionPassenger.require_passenger_lib 'loader_shared_helpers'
 		PhusionPassenger.require_passenger_lib 'request_handler'
 		PhusionPassenger.require_passenger_lib 'rack/thread_handler_extension'
-		LoaderSharedHelpers.init
-		@@options = LoaderSharedHelpers.sanitize_spawn_options(@@options)
+		@@options = LoaderSharedHelpers.init(@@options)
 		Utils.passenger_tmpdir = options["generation_dir"]
 		if defined?(NativeSupport)
 			NativeSupport.disable_stdio_buffering
@@ -58,6 +85,7 @@ module App
 	rescue Exception => e
 		LoaderSharedHelpers.about_to_abort(e) if defined?(LoaderSharedHelpers)
 		puts "!> Error"
+		puts "!> html: true" if e.respond_to?(:html?) && e.html?
 		puts "!> "
 		puts format_exception(e)
 		exit exit_code_for_exception(e)
@@ -84,6 +112,7 @@ module App
 	rescue Exception => e
 		LoaderSharedHelpers.about_to_abort(e)
 		puts "!> Error"
+		puts "!> html: true" if e.respond_to?(:html?) && e.html?
 		puts "!> "
 		puts format_exception(e)
 		exit exit_code_for_exception(e)

data/helper-scripts/rack-preloader.rb

@@ -38,7 +38,12 @@ module App
 	def self.format_exception(e)
 		result = "#{e} (#{e.class})"
 		if !e.backtrace.empty?
-			result << "\n  " << e.backtrace.join("\n  ")
+			if e.respond_to?(:html?) && e.html?
+				require 'erb' if !defined?(ERB)
+				result << "\n<pre>  " << ERB::Util.h(e.backtrace.join("\n  ")) << "</pre>"
+			else
+				result << "\n  " << e.backtrace.join("\n  ")
+			end
 		end
 		return result
 	end
@@ -74,9 +79,8 @@ module App
 		PhusionPassenger.require_passenger_lib 'loader_shared_helpers'
 		PhusionPassenger.require_passenger_lib 'request_handler'
 		PhusionPassenger.require_passenger_lib 'rack/thread_handler_extension'
-		LoaderSharedHelpers.init
-		PreloaderSharedHelpers.init
-		@@options = LoaderSharedHelpers.sanitize_spawn_options(@@options)
+		@@options = LoaderSharedHelpers.init(@@options)
+		@@options = PreloaderSharedHelpers.init(@@options)
 		Utils.passenger_tmpdir = options["generation_dir"]
 		if defined?(NativeSupport)
 			NativeSupport.disable_stdio_buffering
@@ -85,6 +89,7 @@ module App
 	rescue Exception => e
 		LoaderSharedHelpers.about_to_abort(e) if defined?(LoaderSharedHelpers)
 		puts "!> Error"
+		puts "!> html: true" if e.respond_to?(:html?) && e.html?
 		puts "!> "
 		puts format_exception(e)
 		exit exit_code_for_exception(e)
@@ -111,6 +116,7 @@ module App
 	rescue Exception => e
 		LoaderSharedHelpers.about_to_abort(e)
 		puts "!> Error"
+		puts "!> html: true" if e.respond_to?(:html?) && e.html?
 		puts "!> "
 		puts format_exception(e)
 		exit exit_code_for_exception(e)

data/lib/phusion_passenger.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #  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.
 #
@@ -30,7 +30,7 @@ module PhusionPassenger
 	
 	PACKAGE_NAME = 'passenger'
 	# Run 'rake ext/common/Constants.h' after changing this number.
-	VERSION_STRING = '4.0.33'
+	VERSION_STRING = '4.0.34'
 	
 	PREFERRED_NGINX_VERSION = '1.4.4'
 	NGINX_SHA256_CHECKSUM = '7c989a58e5408c9593da0bebcd0e4ffc3d892d1316ba5042ddb0be5b0b4102b9'
@@ -46,6 +46,8 @@ module PhusionPassenger
 	GLOBAL_NAMESPACE_DIRNAME            = "passenger"
 	# Subdirectory under $HOME to use for storing stuff.
 	USER_NAMESPACE_DIRNAME              = ".passenger"
+	# The name for the /etc/apache2/mods-available/*.{load,conf} file.
+	APACHE2_MODULE_CONF_NAME            = "passenger"
 	
 	# Directories in which to look for plugins.
 	PLUGIN_DIRS = [
@@ -72,8 +74,23 @@ module PhusionPassenger
 		# Directory in which downloaded Phusion Passenger binaries are stored.
 		# Only available when originally packaged.
 		:download_cache_dir,
+		# Directory which contains the main Phusion Passenger Rakefile. Only
+		# available when originally packaged,
+		:build_system_dir,
 		# Directory in which the build system's output is stored, e.g.
-		# the compiled agent executables. Only available when originally packaged.
+		# the compiled agent executables. Only available when originally
+		# packaged.
+		:buildout_dir,
+		# Directory in which we can run 'rake apache2'. Used by
+		# passenger-install-apache2-module. Rake will save the Apache module
+		# to `apache2_module_path`.
+		:apache2_module_source_dir
+	].freeze
+	# The subset of the optional fields which are only available when
+	# originally packaged.
+	ORIGINALLY_PACKAGED_LOCATIONS_INI_FIELDS = [
+		:download_cache_dir,
+		:build_system_dir,
 		:buildout_dir
 	].freeze
 	
@@ -86,21 +103,18 @@ module PhusionPassenger
 			filename = root_or_file
 			options  = parse_ini_file(filename)
 			
-			@natively_packaged       = get_bool_option(filename, options, 'natively_packaged')
-			if natively_packaged?
-				@native_packaging_method = get_option(filename, options, 'native_packaging_method')
-			end
+			@natively_packaged = get_bool_option(filename, options, 'natively_packaged')
 			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
-			if !originally_packaged?
-				# Since these options are only supposed to be available when
-				# originally packaged, force them to be nil when natively packaged.
-				@download_cache_dir = nil
-				@buildout_dir = nil
+			if natively_packaged?
+				@native_packaging_method = get_option(filename, options, 'native_packaging_method')
+				ORIGINALLY_PACKAGED_LOCATIONS_INI_FIELDS.each do |field|
+					instance_variable_set("@#{field}", nil)
+				end
 			end
 		else
 			@source_root           = File.dirname(File.dirname(FILE_LOCATION))
@@ -112,13 +126,15 @@ 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)
+			@ruby_libdir           = File.dirname(FILE_LOCATION).freeze
 			@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"
-			@download_cache_dir    = "#{@source_root}/download_cache"
-			@buildout_dir          = "#{@source_root}/buildout"
+			@ruby_extension_source_dir = "#{@source_root}/ext/ruby".freeze
+			@nginx_module_source_dir   = "#{@source_root}/ext/nginx".freeze
+			@download_cache_dir        = "#{@source_root}/download_cache".freeze
+			@build_system_dir          = @source_root.dup.freeze
+			@buildout_dir              = "#{@source_root}/buildout".freeze
+			@apache2_module_source_dir = @source_root.dup.freeze
 			REQUIRED_LOCATIONS_INI_FIELDS.each do |field|
 				if instance_variable_get("@#{field}").nil?
 					raise "BUG: @#{field} not set"
@@ -138,7 +154,7 @@ module PhusionPassenger
 	end
 
 	# If Phusion Passenger is natively packaged, returns which packaging
-	# method was used. Can be 'deb' or 'rpm'.
+	# method was used. Can be 'deb', 'rpm' or 'homebrew'.
 	def self.native_packaging_method
 		return @native_packaging_method
 	end
@@ -187,14 +203,17 @@ module PhusionPassenger
 	
 	###### Other resource locations ######
 	
-	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"
+	def self.binaries_sites
+		return [
+			{ :url => "https://oss-binaries.phusionpassenger.com/binaries/passenger/by_release",
+			  :cacert => "#{resources_dir}/oss-binaries.phusionpassenger.com.crt" },
+			{ :url => "https://s3.amazonaws.com/phusion-passenger/binaries/passenger/by_release" }
+		]
 	end
 	
 	

data/lib/phusion_passenger/abstract_installer.rb

@@ -105,6 +105,9 @@ protected
 	
 	
 	def before_install
+		if STDOUT.respond_to?(:set_encoding)
+			STDOUT.set_encoding("UTF-8")
+		end
 		STDOUT.write(Utils::AnsiColors::DEFAULT_TERMINAL_COLOR)
 		STDOUT.flush
 	end
@@ -186,9 +189,9 @@ protected
 		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
+		   PhusionPassenger.build_system_dir =~ /^#{Regexp.escape home_dir}\// &&
+		   PhusionPassenger.build_system_dir =~ /^#{Regexp.escape Gem.dir}\// &&
+		   File.stat(PhusionPassenger.build_system_dir).uid == 0
 			new_screen
 			render_template 'installer_common/gem_install_permission_problems'
 			return false
@@ -200,7 +203,7 @@ protected
 	def check_directory_accessible_by_web_server
 		return true if PhusionPassenger.natively_packaged?
 		inaccessible_directories = []
-		list_parent_directories(PhusionPassenger.source_root).each do |path|
+		list_parent_directories(PhusionPassenger.build_system_dir).each do |path|
 			if !world_executable?(path)
 				inaccessible_directories << path
 			end

data/lib/phusion_passenger/analytics_logger.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.
 #
@@ -23,6 +23,7 @@
 
 require 'thread'
 PhusionPassenger.require_passenger_lib 'utils'
+PhusionPassenger.require_passenger_lib 'utils/native_support_utils'
 PhusionPassenger.require_passenger_lib 'debug_logging'
 PhusionPassenger.require_passenger_lib 'message_channel'
 
@@ -81,12 +82,12 @@ class AnalyticsLogger
 			else
 				extra_info_base64 = nil
 			end
-			times = NativeSupport.process_times
+			times = Utils::NativeSupportUtils.process_times
 			message "BEGIN: #{name} (#{current_timestamp.to_s(36)},#{times.utime.to_s(36)},#{times.stime.to_s(36)}) #{extra_info_base64}"
 		end
 		
 		def end_measure(name, error_encountered = false)
-			times = NativeSupport.process_times
+			times = Utils::NativeSupportUtils.process_times
 			if error_encountered
 				message "FAIL: #{name} (#{current_timestamp.to_s(36)},#{times.utime.to_s(36)},#{times.stime.to_s(36)})"
 			else