passenger 4.0.60 → 5.0.0.beta1

data/helper-scripts/rack-loader.rb

@@ -28,7 +28,7 @@ module App
 	def self.options
 		return @@options
 	end
-	
+
 	def self.app
 		return @@app
 	end
@@ -53,31 +53,30 @@ module App
 			return 1
 		end
 	end
-	
+
 	def self.handshake_and_read_startup_request
 		STDOUT.sync = true
 		STDERR.sync = true
 		puts "!> I have control 1.0"
 		abort "Invalid initialization header" if STDIN.readline != "You have control 1.0\n"
-		
+
 		@@options = {}
 		while (line = STDIN.readline) != "\n"
 			name, value = line.strip.split(/: */, 2)
 			@@options[name] = value
 		end
 	end
-	
+
 	def self.init_passenger
 		require "#{options["ruby_libdir"]}/phusion_passenger"
 		PhusionPassenger.locate_directories(options["passenger_root"])
 		PhusionPassenger.require_passenger_lib 'native_support'
 		PhusionPassenger.require_passenger_lib 'ruby_core_enhancements'
-		PhusionPassenger.require_passenger_lib 'utils/tmpdir'
+		PhusionPassenger.require_passenger_lib 'ruby_core_io_enhancements'
 		PhusionPassenger.require_passenger_lib 'loader_shared_helpers'
 		PhusionPassenger.require_passenger_lib 'request_handler'
 		PhusionPassenger.require_passenger_lib 'rack/thread_handler_extension'
 		@@options = LoaderSharedHelpers.init(@@options)
-		Utils.passenger_tmpdir = options["generation_dir"]
 		if defined?(NativeSupport)
 			NativeSupport.disable_stdio_buffering
 		end
@@ -90,12 +89,12 @@ module App
 		puts format_exception(e)
 		exit exit_code_for_exception(e)
 	end
-	
+
 	def self.load_app
 		LoaderSharedHelpers.before_loading_app_code_step1('config.ru', options)
 		LoaderSharedHelpers.run_load_path_setup_code(options)
 		LoaderSharedHelpers.before_loading_app_code_step2(options)
-		
+
 		begin
 			require 'rubygems'
 		rescue LoadError
@@ -107,7 +106,7 @@ module App
 		end
 		@@app = eval("Rack::Builder.new {( #{rackup_code}\n )}.to_app",
 			TOPLEVEL_BINDING, rackup_file)
-		
+
 		LoaderSharedHelpers.after_loading_app_code(options)
 	rescue Exception => e
 		LoaderSharedHelpers.about_to_abort(e)
@@ -117,11 +116,11 @@ module App
 		puts format_exception(e)
 		exit exit_code_for_exception(e)
 	end
-	
-	
+
+
 	################## Main code ##################
-	
-	
+
+
 	handshake_and_read_startup_request
 	init_passenger
 	load_app
@@ -133,6 +132,6 @@ module App
 	handler.main_loop
 	handler.cleanup
 	LoaderSharedHelpers.after_handling_requests
-	
+
 end # module App
 end # module PhusionPassenger

data/helper-scripts/rack-preloader.rb

@@ -30,7 +30,7 @@ module App
 	def self.options
 		return @@options
 	end
-	
+
 	def self.app
 		return @@app
 	end
@@ -55,33 +55,32 @@ module App
 			return 1
 		end
 	end
-	
+
 	def self.handshake_and_read_startup_request
 		STDOUT.sync = true
 		STDERR.sync = true
 		puts "!> I have control 1.0"
 		abort "Invalid initialization header" if STDIN.readline != "You have control 1.0\n"
-		
+
 		@@options = {}
 		while (line = STDIN.readline) != "\n"
 			name, value = line.strip.split(/: */, 2)
 			@@options[name] = value
 		end
 	end
-	
+
 	def self.init_passenger
 		require "#{options["ruby_libdir"]}/phusion_passenger"
 		PhusionPassenger.locate_directories(options["passenger_root"])
 		PhusionPassenger.require_passenger_lib 'native_support'
 		PhusionPassenger.require_passenger_lib 'ruby_core_enhancements'
-		PhusionPassenger.require_passenger_lib 'utils/tmpdir'
+		PhusionPassenger.require_passenger_lib 'ruby_core_io_enhancements'
 		PhusionPassenger.require_passenger_lib 'preloader_shared_helpers'
 		PhusionPassenger.require_passenger_lib 'loader_shared_helpers'
 		PhusionPassenger.require_passenger_lib 'request_handler'
 		PhusionPassenger.require_passenger_lib 'rack/thread_handler_extension'
 		@@options = LoaderSharedHelpers.init(@@options)
 		@@options = PreloaderSharedHelpers.init(@@options)
-		Utils.passenger_tmpdir = options["generation_dir"]
 		if defined?(NativeSupport)
 			NativeSupport.disable_stdio_buffering
 		end
@@ -94,12 +93,12 @@ module App
 		puts format_exception(e)
 		exit exit_code_for_exception(e)
 	end
-	
+
 	def self.preload_app
 		LoaderSharedHelpers.before_loading_app_code_step1('config.ru', options)
 		LoaderSharedHelpers.run_load_path_setup_code(options)
 		LoaderSharedHelpers.before_loading_app_code_step2(options)
-		
+
 		begin
 			require 'rubygems'
 		rescue LoadError
@@ -111,7 +110,7 @@ module App
 		end
 		@@app = eval("Rack::Builder.new {( #{rackup_code}\n )}.to_app",
 			TOPLEVEL_BINDING, rackup_file)
-		
+
 		LoaderSharedHelpers.after_loading_app_code(options)
 	rescue Exception => e
 		LoaderSharedHelpers.about_to_abort(e)
@@ -121,18 +120,18 @@ module App
 		puts format_exception(e)
 		exit exit_code_for_exception(e)
 	end
-	
+
 	def self.negotiate_spawn_command
 		puts "!> I have control 1.0"
 		abort "Invalid initialization header" if STDIN.readline != "You have control 1.0\n"
-		
+
 		begin
 			while (line = STDIN.readline) != "\n"
 				name, value = line.strip.split(/: */, 2)
 				options[name] = value
 			end
 			@@options = LoaderSharedHelpers.sanitize_spawn_options(@@options)
-			
+
 			LoaderSharedHelpers.before_handling_requests(true, options)
 			handler = RequestHandler.new(STDIN, options.merge("app" => app))
 		rescue Exception => e
@@ -148,11 +147,11 @@ module App
 		puts "!> "
 		return handler
 	end
-	
-	
+
+
 	################## Main code ##################
-	
-	
+
+
 	handshake_and_read_startup_request
 	init_passenger
 	preload_app
@@ -162,6 +161,6 @@ module App
 		handler.cleanup
 		LoaderSharedHelpers.after_handling_requests
 	end
-	
+
 end # module App
 end # module PhusionPassenger

data/helper-scripts/wsgi-loader.py

@@ -62,10 +62,10 @@ def load_app():
 
 def create_server_socket():
 	global options
-
-	UNIX_PATH_MAX = options.get('UNIX_PATH_MAX', 100)
-	if 'generation_dir' in options:
-		socket_dir = options['generation_dir'] + '/backends'
+	
+	UNIX_PATH_MAX = int(options.get('UNIX_PATH_MAX', 100))
+	if 'socket_dir' in options:
+		socket_dir = options['socket_dir']
 		socket_prefix = 'wsgi'
 	else:
 		socket_dir = tempfile.gettempdir()
@@ -244,7 +244,8 @@ class RequestHandler:
 
 		headers_set = []
 		headers_sent = []
-		
+		is_head = env['REQUEST_METHOD'] == 'HEAD'
+
 		def write(data):
 			try:
 				if not headers_set:
@@ -252,11 +253,14 @@ class RequestHandler:
 				elif not headers_sent:
 					# Before the first output, send the stored headers.
 					status, response_headers = headers_sent[:] = headers_set
-					output_stream.sendall(str_to_bytes('Status: %s\r\n' % status))
+					output_stream.sendall(str_to_bytes(
+						'HTTP/1.1 %s\r\nStatus: %s\r\nConnection: close\r\n' %
+						(status, status)))
 					for header in response_headers:
 						output_stream.sendall(str_to_bytes('%s: %s\r\n' % header))
 					output_stream.sendall(b'\r\n')
-				output_stream.sendall(data)
+				if not is_head:
+					output_stream.sendall(data)
 			except IOError:
 				# Mark this exception as coming from the Phusion Passenger
 				# socket and not some other socket.

data/lib/phusion_passenger.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -30,10 +30,10 @@ module PhusionPassenger
 
 	PACKAGE_NAME = 'passenger'
 	# Run 'rake ext/common/Constants.h' after changing this number.
-	VERSION_STRING = '4.0.60'
+	VERSION_STRING = '5.0.0.beta1'
 
-	PREFERRED_NGINX_VERSION = '1.6.3'
-	NGINX_SHA256_CHECKSUM = '0a98e95b366e4d6042f331e1fa4d70e18fd1e49d8993e589008e70e742b7e757'
+	PREFERRED_NGINX_VERSION = '1.6.2'
+	NGINX_SHA256_CHECKSUM = 'b5608c2959d3e7ad09b20fc8f9e5bd4bc87b3bc8ba5936a513c04ed8f1391a18'
 
 	PREFERRED_PCRE_VERSION  = '8.34'
 	PCRE_SHA256_CHECKSUM = '1dd78994c81e44ac41cf30b2a21d4b4cc6d76ccde7fc6e77713ed51d7bddca47'
@@ -43,67 +43,62 @@ module PhusionPassenger
 
 	###### Directories ######
 
-	GLOBAL_NAMESPACE_DIRNAME            = "passenger"
+	GLOBAL_NAMESPACE_DIRNAME_           = "passenger"
 	# Subdirectory under $HOME to use for storing stuff.
-	USER_NAMESPACE_DIRNAME              = ".passenger"
+	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 = [
-		"/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/plugins",
-		"/usr/local/share/#{GLOBAL_NAMESPACE_DIRNAME}/plugins",
-		"~/#{USER_NAMESPACE_DIRNAME}/plugins"
+		"/usr/share/#{GLOBAL_NAMESPACE_DIRNAME_}/plugins",
+		"/usr/local/share/#{GLOBAL_NAMESPACE_DIRNAME_}/plugins",
+		"~/#{USER_NAMESPACE_DIRNAME_}/plugins"
 	]
 
 	REQUIRED_LOCATIONS_INI_FIELDS = [
+		# User-invoked commands
 		:bin_dir,
-		:agents_dir,
+		# Support binaries
+		:support_binaries_dir,
+		# Library files like libboost_oxt.a and various .o files
 		:lib_dir,
+		# Scripts not directly invoked by users
 		:helper_scripts_dir,
+		# Various non-executable resources
 		:resources_dir,
+		# C header files, necessary for compiling Nginx
 		:include_dir,
+		# Documentation
 		:doc_dir,
+		# Ruby support libraries
 		:ruby_libdir,
+		# Node.js support libraries
 		:node_libdir,
+		# Path to the compiled Apache module
 		:apache2_module_path,
+		# Directory containing the source code of our Ruby extension
 		:ruby_extension_source_dir,
+		# Directory containing the source code of our Nginx module
 		: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,
 		# 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.
-		: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
+		# Directory in which downloaded Phusion Passenger binaries are cached.
+		: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)
-		source_root_or_location_configuration_file ||= find_location_configuration_file
-		root_or_file = @source_root = source_root_or_location_configuration_file
-
-		if root_or_file && File.file?(root_or_file)
-			filename = root_or_file
+	def self.locate_directories(install_spec = nil)
+		@install_spec = install_spec || infer_install_spec
+		if @install_spec && File.file?(@install_spec)
+			filename = @install_spec
 			options  = parse_ini_file(filename)
 
-			@natively_packaged = get_bool_option(filename, options, 'natively_packaged')
+			@custom_packaged = true
+			@packaging_method = get_option(filename, options, 'packaging_method')
 			REQUIRED_LOCATIONS_INI_FIELDS.each do |field|
 				value = get_option(filename, options, field.to_s)
 				value.freeze unless value.nil?
@@ -114,31 +109,24 @@ module PhusionPassenger
 				value.freeze unless value.nil?
 				instance_variable_set("@#{field}", value)
 			end
-			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))
-			@natively_packaged     = false
-			@bin_dir               = "#{@source_root}/bin".freeze
-			@agents_dir            = "#{@source_root}/buildout/agents".freeze
-			@lib_dir               = "#{@source_root}/buildout".freeze
-			@helper_scripts_dir    = "#{@source_root}/helper-scripts".freeze
-			@resources_dir         = "#{@source_root}/resources".freeze
-			@include_dir           = "#{@source_root}/ext".freeze
-			@doc_dir               = "#{@source_root}/doc".freeze
+			source_root            = File.dirname(File.dirname(FILE_LOCATION))
+			@install_spec          = source_root
+			@custom_packaged       = false
+			@bin_dir               = "#{source_root}/bin".freeze
+			@support_binaries_dir  = "#{source_root}/buildout/support-binaries".freeze
+			@lib_dir               = "#{source_root}/buildout".freeze
+			@helper_scripts_dir    = "#{source_root}/helper-scripts".freeze
+			@resources_dir         = "#{source_root}/resources".freeze
+			@include_dir           = "#{source_root}/ext".freeze
+			@doc_dir               = "#{source_root}/doc".freeze
 			@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".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
+			@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".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
 			REQUIRED_LOCATIONS_INI_FIELDS.each do |field|
 				if instance_variable_get("@#{field}").nil?
 					raise "BUG: @#{field} not set"
@@ -148,19 +136,20 @@ module PhusionPassenger
 	end
 
 	# Returns whether this Phusion Passenger installation is in the 'originally packaged'
-	# configuration (as opposed to the 'natively packaged' configuration.
+	# configuration (as opposed to the 'custom packaged' configuration.
 	def self.originally_packaged?
-		return !@natively_packaged
+		return !@custom_packaged
 	end
 
-	def self.natively_packaged?
-		return @natively_packaged
+	def self.custom_packaged?
+		return @custom_packaged
 	end
 
-	# If Phusion Passenger is natively packaged, returns which packaging
-	# method was used. Can be 'deb', 'rpm' or 'homebrew'.
-	def self.native_packaging_method
-		return @native_packaging_method
+	# If Phusion Passenger is custom packaged, returns which packaging
+	# method was used. Can be 'deb', 'rpm', 'homebrew', 'test'
+	# or 'unknown'.
+	def self.packaging_method
+		return @custom_packaging_method
 	end
 
 	# Whether the current Phusion Passenger installation is installed
@@ -171,10 +160,9 @@ module PhusionPassenger
 		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
+	# The installation specification string, as passed to #locate_directories.
+	def self.install_spec
+		return @install_spec
 	end
 
 	# Generate getters for the directory types in locations.ini.
@@ -188,6 +176,24 @@ module PhusionPassenger
 	end
 	eval(getters_code, binding, __FILE__, __LINE__)
 
+	def self.user_support_binaries_dir
+		return "#{home_dir}/#{USER_NAMESPACE_DIRNAME_}/support-binaries/#{VERSION_STRING}"
+	end
+
+	def self.find_support_binary(name)
+		all_support_binary_dirs = [
+			support_binaries_dir,
+			user_support_binaries_dir
+		]
+		all_support_binary_dirs.each do |dir|
+			result = "#{dir}/#{name}"
+			if File.exist?(result)
+				return result
+			end
+		end
+		return nil
+	end
+
 	def self.index_doc_path
 		return "#{doc_dir}/#{INDEX_DOC_NAME}"
 	end
@@ -207,15 +213,16 @@ module PhusionPassenger
 
 	###### Other resource locations ######
 
-	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"
+	INDEX_DOC_NAME      = "Users guide.html".freeze
+	APACHE2_DOC_NAME    = "Users guide Apache.html".freeze
+	NGINX_DOC_NAME      = "Users guide Nginx.html".freeze
+	STANDALONE_DOC_NAME = "Users guide Standalone.html".freeze
 
 	def self.binaries_sites
 		return [
-			{ :url => "https://oss-binaries.phusionpassenger.com/binaries/passenger/by_release" },
-			{ :url => "https://s3.amazonaws.com/phusion-passenger/binaries/passenger/by_release" }
+			{ :url => "https://oss-binaries.phusionpassenger.com/binaries/passenger/by_release".freeze,
+			  :cacert => "#{resources_dir}/oss-binaries.phusionpassenger.com.crt".freeze },
+			{ :url => "https://s3.amazonaws.com/phusion-passenger/binaries/passenger/by_release".freeze }
 		]
 	end
 
@@ -238,7 +245,7 @@ module PhusionPassenger
 
 
 private
-	def self.find_location_configuration_file
+	def self.infer_install_spec
 		filename = ENV['PASSENGER_LOCATION_CONFIGURATION_FILE']
 		return filename if filename && !filename.empty?
 
@@ -253,11 +260,11 @@ private
 			home_dir = ENV['HOME']
 		end
 		if home_dir && !home_dir.empty?
-			filename = "#{home_dir}/#{USER_NAMESPACE_DIRNAME}/locations.ini"
+			filename = "#{home_dir}/#{USER_NAMESPACE_DIRNAME_}/locations.ini"
 			return filename if File.exist?(filename)
 		end
 
-		filename = "/etc/#{GLOBAL_NAMESPACE_DIRNAME}/locations.ini"
+		filename = "/etc/#{GLOBAL_NAMESPACE_DIRNAME_}/locations.ini"
 		return filename if File.exist?(filename)
 
 		return nil
@@ -297,4 +304,18 @@ private
 		value = get_option(filename, options, key)
 		return value == 'yes' || value == 'true' || value == 'on' || value == '1'
 	end
+
+	# The HOME environment variable is often unreliable, because for
+	# example `sudo` preserves it. That's why we don't respect it by
+	# default.
+	def self.home_dir(respect_home_env = false)
+		if respect_home_env
+			home = ENV['HOME'].to_s
+		end
+		if home.nil? || home.empty?
+			require 'etc' if !defined?(Etc)
+			home = Etc.getpwuid(Process.uid).dir
+		end
+		return home
+	end
 end if !defined?(PhusionPassenger::VERSION_STRING)