passenger 4.0.48 → 4.0.49

data/lib/phusion_passenger.rb

@@ -24,38 +24,38 @@
 
 module PhusionPassenger
 	FILE_LOCATION = File.expand_path(__FILE__)
-	
-	
+
+
 	###### Names and version numbers ######
-	
+
 	PACKAGE_NAME = 'passenger'
 	# Run 'rake ext/common/Constants.h' after changing this number.
-	VERSION_STRING = '4.0.48'
-	
-	PREFERRED_NGINX_VERSION = '1.6.0'
-	NGINX_SHA256_CHECKSUM = '943ad757a1c3e8b3df2d5c4ddacc508861922e36fa10ea6f8e3a348fc9abfc1a'
+	VERSION_STRING = '4.0.49'
+
+	PREFERRED_NGINX_VERSION = '1.6.1'
+	NGINX_SHA256_CHECKSUM = 'f5cfe682a1aeef4602c2ca705402d5049b748f946563f41d8256c18674836067'
 
 	PREFERRED_PCRE_VERSION  = '8.34'
 	PCRE_SHA256_CHECKSUM = '1dd78994c81e44ac41cf30b2a21d4b4cc6d76ccde7fc6e77713ed51d7bddca47'
 
 	STANDALONE_INTERFACE_VERSION  = 1
-	
-	
+
+
 	###### Directories ######
-	
+
 	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 = [
 		"/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/plugins",
 		"/usr/local/share/#{GLOBAL_NAMESPACE_DIRNAME}/plugins",
 		"~/#{USER_NAMESPACE_DIRNAME}/plugins"
 	]
-	
+
 	REQUIRED_LOCATIONS_INI_FIELDS = [
 		:bin_dir,
 		:agents_dir,
@@ -93,16 +93,16 @@ module PhusionPassenger
 		:build_system_dir,
 		:buildout_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
 			options  = parse_ini_file(filename)
-			
+
 			@natively_packaged = get_bool_option(filename, options, 'natively_packaged')
 			REQUIRED_LOCATIONS_INI_FIELDS.each do |field|
 				value = get_option(filename, options, field.to_s)
@@ -146,7 +146,7 @@ module PhusionPassenger
 			end
 		end
 	end
-	
+
 	# Returns whether this Phusion Passenger installation is in the 'originally packaged'
 	# configuration (as opposed to the 'natively packaged' configuration.
 	def self.originally_packaged?
@@ -203,10 +203,10 @@ module PhusionPassenger
 	def self.standalone_doc_path
 		return "#{doc_dir}/#{STANDALONE_DOC_NAME}"
 	end
-	
-	
+
+
 	###### Other resource locations ######
-	
+
 	INDEX_DOC_NAME      = "Users guide.html"
 	APACHE2_DOC_NAME    = "Users guide Apache.html"
 	NGINX_DOC_NAME      = "Users guide Nginx.html"
@@ -219,17 +219,17 @@ module PhusionPassenger
 			{ :url => "https://s3.amazonaws.com/phusion-passenger/binaries/passenger/by_release" }
 		]
 	end
-	
-	
+
+
 	# Instead of calling `require 'phusion_passenger/foo'`, you should call
 	# `PhusionPassenger.require_passenger_lib 'foo'`. This is because when Phusion
 	# Passenger is natively packaged, it may still be run with arbitrary Ruby
 	# interpreters. Adding ruby_libdir to $LOAD_PATH is then dangerous because ruby_libdir
 	# may be the distribution's Ruby's vendor_ruby directory, which may be incompatible
 	# with the active Ruby interpreter. This method looks up the exact filename directly.
-	# 
+	#
 	# Using this method also has two more advantages:
-	# 
+	#
 	#  1. It is immune to Bundler's load path mangling code.
 	#  2. It is faster than plan require() because it doesn't need to
 	#     scan the entire load path.
@@ -293,7 +293,7 @@ private
 			return nil
 		end
 	end
-	
+
 	def self.get_bool_option(filename, options, key)
 		value = get_option(filename, options, key)
 		return value == 'yes' || value == 'true' || value == 'on' || value == '1'

data/lib/phusion_passenger/common_library.rb

@@ -382,6 +382,8 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
 			ApplicationPool2/Pool.h
 			ApplicationPool2/SuperGroup.h
 			ApplicationPool2/Group.h
+			ApplicationPool2/Process.h
+			ApplicationPool2/Socket.h
 			ApplicationPool2/Session.h
 			ApplicationPool2/Options.h
 			ApplicationPool2/PipeWatcher.h

data/lib/phusion_passenger/loader_shared_helpers.rb

@@ -69,7 +69,7 @@ module LoaderSharedHelpers
 	def to_boolean(value)
 		return !(value.nil? || value == false || value == "false")
 	end
-	
+
 	def sanitize_spawn_options(options)
 		defaults = {
 			"app_type"         => "rack",
@@ -86,7 +86,7 @@ module LoaderSharedHelpers
 		# in this case.
 		options["debugger"]     = to_boolean(options["debugger"])
 		options["spawn_method"] = "direct" if options["debugger"]
-		
+
 		return options
 	end
 
@@ -182,7 +182,7 @@ module LoaderSharedHelpers
 	rescue SystemCallError
 		# Don't care.
 	end
-	
+
 	# Prepare an application process using rules for the given spawn options.
 	# This method is to be called before loading the application code.
 	#
@@ -199,7 +199,7 @@ module LoaderSharedHelpers
 		PhusionPassenger.require_passenger_lib 'union_station/core'
 		options["union_station_core"] = UnionStation::Core.new_from_options(options)
 	end
-	
+
 	def run_load_path_setup_code(options)
 		# rack-preloader.rb depends on the 'rack' library, but the app
 		# might want us to use a bundled version instead of a
@@ -220,17 +220,17 @@ module LoaderSharedHelpers
 		#   These apps call Bundler.setup in their preinitializer.rb.
 		#
 		# So the strategy is as follows:
-		
+
 		# Our strategy might be completely unsuitable for the app or the
 		# developer is using something other than Bundler, so we let the user
 		# manually specify a load path setup file.
 		if options["load_path_setup_file"]
 			require File.expand_path(options["load_path_setup_file"])
-		
+
 		# The app developer may also override our strategy with this magic file.
 		elsif File.exist?('config/setup_load_paths.rb')
 			require File.expand_path('config/setup_load_paths')
-		
+
 		# Older versions of Bundler use .bundle/environment.rb as the Bundler
 		# environment lock file. This has been replaced by Gemfile.lock in later
 		# versions, but we still support the older mechanism.
@@ -241,7 +241,7 @@ module LoaderSharedHelpers
 			running_bundler(options) do
 				require File.expand_path('.bundle/environment')
 			end
-		
+
 		# If the legacy Bundler environment file doesn't exist then there are two
 		# possibilities:
 		# 1. Bundler is not used, in which case we don't have to do anything.
@@ -263,17 +263,17 @@ module LoaderSharedHelpers
 				require 'bundler/setup'
 			end
 		end
-		
-		
+
+
 		# !!! NOTE !!!
 		# If the app is using Bundler then any dependencies required past this
 		# point must be specified in the Gemfile. Like ruby-debug if debugging is on...
 	end
-	
+
 	def before_loading_app_code_step2(options)
 		# Do nothing.
 	end
-	
+
 	# This method is to be called after loading the application code but
 	# before forking a worker process.
 	def after_loading_app_code(options)
@@ -283,7 +283,7 @@ module LoaderSharedHelpers
 			require 'rails/version'
 		end
 	end
-	
+
 	def create_socket_address(protocol, address)
 		if protocol == 'unix'
 			return "unix:#{address}"
@@ -293,7 +293,7 @@ module LoaderSharedHelpers
 			raise ArgumentError, "Unknown protocol '#{protocol}'"
 		end
 	end
-	
+
 	def advertise_readiness
 		# https://code.google.com/p/phusion-passenger/issues/detail?id=1039
 		puts
@@ -307,7 +307,7 @@ module LoaderSharedHelpers
 			output.puts "!> socket: #{name};#{options[:address]};#{options[:protocol]};#{concurrency}"
 		end
 	end
-	
+
 	# To be called before the request handler main loop is entered, but after the app
 	# startup file has been loaded. This function will fire off necessary events
 	# and perform necessary preparation tasks.
@@ -328,7 +328,7 @@ module LoaderSharedHelpers
 		if forked && options["union_station_core"]
 			options["union_station_core"].clear_connection
 		end
-		
+
 		# If we were forked from a preloader process then clear or
 		# re-establish ActiveRecord database connections. This prevents
 		# child processes from concurrently accessing the same
@@ -343,7 +343,7 @@ module LoaderSharedHelpers
 				ActiveRecord::Base.establish_connection
 			end
 		end
-		
+
 		# Fire off events.
 		PhusionPassenger.call_event(:starting_worker_process, forked)
 		if options["pool_account_username"] && options["pool_account_password_base64"]
@@ -354,7 +354,7 @@ module LoaderSharedHelpers
 			PhusionPassenger.call_event(:credentials, nil, nil)
 		end
 	end
-	
+
 	# To be called after the request handler main loop is exited. This function
 	# will fire off necessary events perform necessary cleanup tasks.
 	def after_handling_requests

data/lib/phusion_passenger/packaging.rb

@@ -91,7 +91,7 @@ module Packaging
 		'doc/**/*',
 		'man/*',
 		'debian.template/**/*',
-		'rpm/**/*',
+		'packaging/**/*',
 		'helper-scripts/**/*',
 		'ext/common/**/*.{cpp,c,h,hpp,md,erb}',
 		'ext/apache2/*.{cpp,h,hpp,c,erb}',
@@ -131,6 +131,8 @@ module Packaging
 	]
 	
 	EXCLUDE_GLOB = [
+		'**/.DS_Store',
+		'packaging/*/.git',
 		'test/stub/rails_apps/3.0/empty/help/**/*',
 		'test/stub/*.dSYM'
 	]
@@ -138,16 +140,19 @@ module Packaging
 	# Files that should be excluded from the Debian tarball.
 	DEBIAN_EXCLUDE_GLOB = [
 		"debian.template/**/*",
+		"packaging/**/*",
 	]
 
 	# Files and directories that should be excluded from the Homebrew installation.
 	HOMEBREW_EXCLUDE = [
-		"dev", "test", ".gitignore", ".travis.yml", "debian.template", "rpm",
-		"Vagrantfile", "package.json", "npm-shrinkwrap.json"
+		".gitignore", ".gitmodules", ".travis.yml", "package.json", "Vagrantfile",
+		"npm-shrinkwrap.json", "debian.template", "packaging", "dev", "test"
 	]
 
 	def self.files
-		return Dir[*GLOB] - Dir[*EXCLUDE_GLOB]
+		result = Dir[*GLOB] - Dir[*EXCLUDE_GLOB]
+		result.reject! { |path| path =~ %r{/\.\.?$} }
+		return result
 	end
 
 	def self.debian_orig_tarball_files

data/lib/phusion_passenger/platform_info/apache.rb

@@ -42,7 +42,7 @@ module PhusionPassenger
 
 module PlatformInfo
 	################ Programs ################
-	
+
 	# The absolute path to the 'apxs' or 'apxs2' executable, or nil if not found.
 	def self.apxs2
 		if env_defined?("APXS2")
@@ -57,14 +57,14 @@ module PlatformInfo
 		return nil
 	end
 	memoize :apxs2
-	
+
 	# The absolute path to the 'apachectl' or 'apache2ctl' binary, or nil if
 	# not found.
 	def self.apache2ctl(options = {})
 		return find_apache2_executable('apache2ctl', 'apachectl2', 'apachectl', options)
 	end
 	memoize :apache2ctl
-	
+
 	# The absolute path to the Apache binary (that is, 'httpd', 'httpd2', 'apache'
 	# or 'apache2'), or nil if not found.
 	def self.httpd(options = {})
@@ -190,7 +190,7 @@ module PlatformInfo
 	memoize :httpd_default_config_file
 
 	# Given an Apache config file, returns the a hash with the following elements:
-	# 
+	#
 	#  * `:files` - An array containing `config_file`, as well as all config files
 	#               included from that config file, including recursively included
 	#               ones. Only filenames that actually exist are put here.
@@ -212,7 +212,7 @@ module PlatformInfo
 	# The default Apache error log's filename, as it is compiled into the Apache
 	# main executable. This may not be the actual error log that is used. The actual
 	# error log depends on the configuration file.
-	# 
+	#
 	# Returns nil if Apache is not detected, or if the default error log filename
 	# cannot be detected.
 	def self.httpd_default_error_log(options = nil)
@@ -285,7 +285,7 @@ module PlatformInfo
 		else
 			httpd = self.httpd
 		end
-		
+
 		httpd_dir = File.dirname(httpd)
 		if httpd_dir == "/usr/bin" || httpd_dir == "/usr/sbin"
 			if File.exist?("/etc/apache2/envvars")
@@ -294,7 +294,7 @@ module PlatformInfo
 				return "/etc/httpd/envvars"
 			end
 		end
-		
+
 		conf_dir = File.expand_path(File.dirname(httpd) + "/../conf")
 		if File.exist?("#{conf_dir}/envvars")
 			return "#{conf_dir}/envvars"
@@ -397,7 +397,7 @@ module PlatformInfo
 		end
 	end
 	memoize :a2dismod
-	
+
 	# The absolute path to the 'apr-config' or 'apr-1-config' executable,
 	# or nil if not found.
 	def self.apr_config
@@ -423,7 +423,7 @@ module PlatformInfo
 		end
 	end
 	memoize :apr_config
-	
+
 	# The absolute path to the 'apu-config' or 'apu-1-config' executable, or nil
 	# if not found.
 	def self.apu_config
@@ -484,10 +484,10 @@ module PlatformInfo
 		end
 		return nil
 	end
-	
-	
+
+
 	################ Directories ################
-	
+
 	# The absolute path to the Apache 2 'bin' directory, or nil if unknown.
 	def self.apache2_bindir(options = {})
 		apxs2 = options[:apxs2] || self.apxs2
@@ -498,7 +498,7 @@ module PlatformInfo
 		end
 	end
 	memoize :apache2_bindir
-	
+
 	# The absolute path to the Apache 2 'sbin' directory, or nil if unknown.
 	def self.apache2_sbindir(options = {})
 		apxs2 = options[:apxs2] || self.apxs2
@@ -509,15 +509,25 @@ module PlatformInfo
 		end
 	end
 	memoize :apache2_sbindir
-	
-	
+
+
 	################ Compiler and linker flags ################
-	
+
+	def self.apache2_module_cflags(with_apr_flags = true)
+		return apache2_module_c_or_cxxflags(:c, with_apr_flags)
+	end
+	memoize :apache2_module_cflags, true
+
+	def self.apache2_module_cxxflags(with_apr_flags = true)
+		return apache2_module_c_or_cxxflags(:cxx, with_apr_flags)
+	end
+	memoize :apache2_module_cxxflags, true
+
 	# The C compiler flags that are necessary to compile an Apache module.
 	# Also includes APR and APU compiler flags if with_apr_flags is true.
-	def self.apache2_module_cflags(with_apr_flags = true)
+	def self.apache2_module_c_or_cxxflags(language, with_apr_flags = true)
 		flags = [""]
-		if cc_is_sun_studio?
+		if (language == :c && cc_is_sun_studio?) || (language == :cxx && cxx_is_sun_studio?)
 			flags << "-KPIC"
 		else
 			flags << "-fPIC"
@@ -551,7 +561,7 @@ module PlatformInfo
 				# is 64-bit. Fix this.
 				apxs2_flags.gsub!('-m32 -march=i386 -mtune=generic', '')
 			end
-			
+
 			apxs2_flags.strip!
 			flags << apxs2_flags
 		end
@@ -598,40 +608,44 @@ module PlatformInfo
 		end
 		return flags.compact.join(' ').strip
 	end
-	memoize :apache2_module_cflags, true
-	
+
 	# Linker flags that are necessary for linking an Apache module.
 	# Already includes APR and APU linker flags.
-	def self.apache2_module_ldflags
-		flags = "-fPIC #{apr_libs} #{apu_libs}"
+	def self.apache2_module_cxx_ldflags
+		if cxx_is_sun_studio?
+			flags = "-KPIC"
+		else
+			flags = "-fPIC"
+		end
+		flags << " #{apr_libs} #{apu_libs}"
 		flags.strip!
 		return flags
 	end
-	memoize :apache2_module_ldflags
-	
+	memoize :apache2_module_cxx_ldflags
+
 	# The C compiler flags that are necessary for programs that use APR.
 	def self.apr_flags
 		return determine_apr_info[0]
 	end
-	
+
 	# The linker flags that are necessary for linking programs that use APR.
 	def self.apr_libs
 		return determine_apr_info[1]
 	end
-	
+
 	# The C compiler flags that are necessary for programs that use APR-Util.
 	def self.apu_flags
 		return determine_apu_info[0]
 	end
-	
+
 	# The linker flags that are necessary for linking programs that use APR-Util.
 	def self.apu_libs
 		return determine_apu_info[1]
 	end
-	
+
 	################ Miscellaneous information ################
-	
-	
+
+
 	# Returns whether it is necessary to use information outputted by
 	# 'apr-config' and 'apu-config' in order to compile an Apache module.
 	# When Apache is installed with --with-included-apr, the APR/APU