passenger 4.0.30 → 4.0.31

data/lib/phusion_passenger/nginx/config_options.rb

@@ -139,6 +139,11 @@ LOCATION_CONFIGURATION_OPTIONS = [
 		:header => nil,
 		:auto_generate_nginx_merge_code => false
 	},
+	{
+		:name   => 'passenger_document_root',
+		:type   => :string,
+		:header => nil
+	},
 	{
 		:name  => 'passenger_user',
 		:type  => :string

data/lib/phusion_passenger/platform_info.rb

@@ -21,7 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'phusion_passenger/utils/tmpio'
+PhusionPassenger.require_passenger_lib 'utils/tmpio'
 
 module PhusionPassenger
 

data/lib/phusion_passenger/platform_info/apache.rb

@@ -22,10 +22,10 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'phusion_passenger/platform_info'
-require 'phusion_passenger/platform_info/compiler'
-require 'phusion_passenger/platform_info/operating_system'
-require 'phusion_passenger/platform_info/linux'
+PhusionPassenger.require_passenger_lib 'platform_info'
+PhusionPassenger.require_passenger_lib 'platform_info/compiler'
+PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
+PhusionPassenger.require_passenger_lib 'platform_info/linux'
 
 module PhusionPassenger
 
@@ -185,7 +185,11 @@ module PlatformInfo
 
 	def self.httpd_actual_error_log(options = nil)
 		if config_file = httpd_default_config_file(options)
-			contents = File.open(config_file, "rb") { |f| f.read }
+			begin
+				contents = File.open(config_file, "rb") { |f| f.read }
+			rescue Errno::EACCES
+				return nil
+			end
 			# We don't want to match comments
 			contents.gsub!(/^[ \t]*#.*/, '')
 			if contents =~ /^ErrorLog (.+)$/

data/lib/phusion_passenger/platform_info/apache_detector.rb

@@ -21,12 +21,11 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'phusion_passenger'
-require 'phusion_passenger/constants'
-require 'phusion_passenger/platform_info'
-require 'phusion_passenger/platform_info/ruby'
-require 'phusion_passenger/platform_info/apache'
-require 'phusion_passenger/utils/ansi_colors'
+PhusionPassenger.require_passenger_lib 'constants'
+PhusionPassenger.require_passenger_lib 'platform_info'
+PhusionPassenger.require_passenger_lib 'platform_info/ruby'
+PhusionPassenger.require_passenger_lib 'platform_info/apache'
+PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
 require 'pathname'
 
 module PhusionPassenger

data/lib/phusion_passenger/platform_info/binary_compatibility.rb

@@ -22,9 +22,9 @@
 #  THE SOFTWARE.
 
 require 'rbconfig'
-require 'phusion_passenger/platform_info'
-require 'phusion_passenger/platform_info/ruby'
-require 'phusion_passenger/platform_info/operating_system'
+PhusionPassenger.require_passenger_lib 'platform_info'
+PhusionPassenger.require_passenger_lib 'platform_info/ruby'
+PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
 
 module PhusionPassenger
 

data/lib/phusion_passenger/platform_info/compiler.rb

@@ -21,8 +21,8 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'phusion_passenger/platform_info'
-require 'phusion_passenger/platform_info/operating_system'
+PhusionPassenger.require_passenger_lib 'platform_info'
+PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
 
 module PhusionPassenger
 
@@ -144,18 +144,25 @@ public
 	def self.cc
 		return string_env('CC', default_cc)
 	end
+	memoize :cc
 	
 	def self.cxx
 		return string_env('CXX', default_cxx)
 	end
+	memoize :cxx
 
 	def self.default_cc
-		# OS X Mavericks (10.9) switched from GCC to Clang as the default compiler,
-		# i.e. as an alias for 'cc'. Since the Nginx by default uses 'cc' as the compiler,
-		# we'll have to do that too. Otherwise we'll get C++ linker errors because Nginx
-		# is compiled with Clang while Phusion Passenger is compiled with GCC.
+		# On most platforms, we'll want to use the same compiler as what the rest
+		# of the system uses, so that we generate compatible binaries. That's
+		# most likely the 'cc' command. We used to use 'gcc' by default.
+		#
+		# See for example this issue with OS X Mavericks (10.9). They switched from
+		# GCC to Clang as the default compiler. Since the Nginx by default uses 'cc'
+		# as the compiler, we'll have to do that too. Otherwise we'll get C++ linker
+		# errors because Nginx is compiled with Clang while Phusion Passenger is
+		# compiled with GCC.
 		# https://code.google.com/p/phusion-passenger/issues/detail?id=950
-		if PlatformInfo.os_name == "macosx"
+		if PlatformInfo.find_command('cc')
 			return 'cc'
 		else
 			return 'gcc'
@@ -163,7 +170,7 @@ public
 	end
 
 	def self.default_cxx
-		if PlatformInfo.os_name == "macosx"
+		if PlatformInfo.find_command('c++')
 			return 'c++'
 		else
 			return 'g++'
@@ -175,6 +182,11 @@ public
 	end
 	memoize :cc_is_gcc?
 
+	def self.cxx_is_gcc?
+		`#{cxx} -v 2>&1` =~ /gcc version/
+	end
+	memoize :cxx_is_gcc?
+
 	def self.cc_is_clang?
 		`#{cc} --version 2>&1` =~ /clang version/
 	end
@@ -428,12 +440,18 @@ public
 	memoize :adress_sanitizer_flag
 
 	def self.cxx_11_flag
-		source = %Q{
-			#include <unordered_map>
+		# C++11 support on FreeBSD 10.0 + Clang seems to be bugged.
+		# http://llvm.org/bugs/show_bug.cgi?id=18310
+		return nil if os_name =~ /freebsd/
+
+		source = %{
+			struct Foo {
+				Foo(Foo &&f) { }
+			};
 		}
 		if try_compile("Checking for C++ -std=gnu++11 compiler flag", :cxx, source, '-std=gnu++11')
 			return "-std=gnu++11"
-		elsif try_compile("Checking for C++ -std=c++11 compiler flag", :cxx, source, '-std=c++')
+		elsif try_compile("Checking for C++ -std=c++11 compiler flag", :cxx, source, '-std=c++11')
 			return "-std=c++11"
 		else
 			return nil

data/lib/phusion_passenger/platform_info/curl.rb

@@ -21,7 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'phusion_passenger/platform_info'
+PhusionPassenger.require_passenger_lib 'platform_info'
 
 module PhusionPassenger
 

data/lib/phusion_passenger/platform_info/cxx_portability.rb

@@ -21,27 +21,26 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'phusion_passenger/platform_info'
-require 'phusion_passenger/platform_info/compiler'
-require 'phusion_passenger/platform_info/operating_system'
+PhusionPassenger.require_passenger_lib 'platform_info'
+PhusionPassenger.require_passenger_lib 'platform_info/compiler'
+PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
 
 module PhusionPassenger
 
 module PlatformInfo
-	# Linker flags that should be used for linking every C/C++ program,
-	# for portability reasons. These flags should be specified as last
-	# when invoking the linker.
-	def self.portability_ldflags
-		if os_name =~ /solaris/
-			result = '-lxnet -lsocket -lnsl -lpthread'
-		else
-			result = '-lpthread'
-		end
-		result << ' -lrt' if has_rt_library?
-		result << ' -lmath' if has_math_library?
-		return result
+	# Extra flags that should always be passed to the C compiler
+	# when linking, to be included last in the command string.
+	def self.portability_c_ldflags
+		return portability_c_or_cxx_ldflags(:c)
+	end
+	memoize :portability_c_ldflags
+
+	# Extra flags that should always be passed to the C++ compiler
+	# when linking, to be included last in the command string.
+	def self.portability_cxx_ldflags
+		return portability_c_or_cxx_ldflags(:cxx)
 	end
-	memoize :portability_ldflags
+	memoize :portability_cxx_ldflags
 
 	# Extra compiler flags that should always be passed to the C compiler,
 	# last in the command string.
@@ -196,6 +195,21 @@ private
 		return flags.compact.map{ |str| str.strip }.join(" ").strip
 	end
 	private_class_method :default_extra_c_or_cxxflags
+
+	def self.portability_c_or_cxx_ldflags(cc_or_cxx)
+		result = ''
+		result << cxx_11_flag if cc_or_cxx == :cxx && cxx_11_flag
+		if os_name =~ /solaris/
+			result << ' -lxnet -lsocket -lnsl -lpthread'
+		else
+			result << ' -lpthread'
+		end
+		result << ' -lrt' if has_rt_library?
+		result << ' -lmath' if has_math_library?
+		result.strip!
+		return result
+	end
+	private_class_method :portability_c_or_cxx_ldflags
 end
 
 end # module PhusionPassenger

data/lib/phusion_passenger/platform_info/depcheck.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
-require 'phusion_passenger/platform_info/ruby'
-require 'phusion_passenger/platform_info/linux'
-require 'phusion_passenger/platform_info/compiler'
-require 'phusion_passenger/platform_info/operating_system'
-require 'phusion_passenger/utils/ansi_colors'
+PhusionPassenger.require_passenger_lib 'platform_info/ruby'
+PhusionPassenger.require_passenger_lib 'platform_info/linux'
+PhusionPassenger.require_passenger_lib 'platform_info/compiler'
+PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
+PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
 
 module PhusionPassenger
 module PlatformInfo
@@ -261,7 +261,7 @@ module Depcheck
 		end
 
 		def install_osx_command_line_tools
-			require 'phusion_passenger/platform_info/compiler'
+			PhusionPassenger.require_passenger_lib 'platform_info/compiler'
 			if PlatformInfo.xcode_select_version.to_s >= "2333"
 				install_instructions "Please install the Xcode command line tools: " +
 					"<b>sudo xcode-select --install</b>"

data/lib/phusion_passenger/platform_info/linux.rb

@@ -21,8 +21,8 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'phusion_passenger/platform_info'
-require 'phusion_passenger/platform_info/operating_system'
+PhusionPassenger.require_passenger_lib 'platform_info'
+PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
 
 module PhusionPassenger
 

data/lib/phusion_passenger/platform_info/operating_system.rb

@@ -22,13 +22,15 @@
 #  THE SOFTWARE.
 
 require 'rbconfig'
-require 'phusion_passenger/platform_info'
+PhusionPassenger.require_passenger_lib 'platform_info'
 
 module PhusionPassenger
 
 module PlatformInfo
 	# Returns the operating system's name. This name is in lowercase and contains no spaces,
-	# and thus is suitable to be used in some kind of ID. E.g. "linux", "macosx".
+	# and thus is suitable to be used in some kind of ID. It may contain a version number.
+	# Linux is always identified as "linux". OS X is always identified as "macosx".
+	# Identifiers for other operating systems may contain a version number, e.g. "freebsd10".
 	def self.os_name
 		if rb_config['target_os'] =~ /darwin/ && (sw_vers = find_command('sw_vers'))
 			return "macosx"
@@ -49,6 +51,22 @@ module PlatformInfo
 		end
 	end
 	
+	# Returns the `uname` command, or nil if `uname` cannot be found.
+	# In addition to looking for `uname` in `PATH`, this method also looks
+	# for `uname` in /bin and /usr/bin, just in case the user didn't
+	# configure its PATH properly.
+	def self.uname_command
+		if result = find_command("uname")
+			result
+		elsif File.exist?("/bin/uname")
+			return "/bin/uname"
+		elsif File.exist?("/usr/bin/uname")
+			return "/usr/bin/uname"
+		else
+			return nil
+		end
+	end
+
 	# Returns a list of all CPU architecture names that the current machine CPU
 	# supports. If there are multiple such architectures then the first item in
 	# the result denotes that OS runtime's main/preferred architecture.
@@ -77,8 +95,10 @@ module PlatformInfo
 	# everything is 64-bit by default. The latter result indicates an OS X
 	# version older than 10.6.
 	def self.cpu_architectures
+		uname = uname_command
+		raise "The 'uname' command cannot be found" if !uname
 		if os_name == "macosx"
-			arch = `uname -p`.strip
+			arch = `#{uname} -p`.strip
 			if arch == "i386"
 				# Macs have been x86 since around 2007. I think all of them come with
 				# a recent enough Intel CPU that supports both x86 and x86_64, and I
@@ -97,12 +117,12 @@ module PlatformInfo
 				arch
 			end
 		else
-			arch = `uname -p`.strip
+			arch = `#{uname} -p`.strip
 			# On some systems 'uname -p' returns something like
 			# 'Intel(R) Pentium(R) M processor 1400MHz' or
 			# 'Intel(R)_Xeon(R)_CPU___________X7460__@_2.66GHz'.
 			if arch == "unknown" || arch =~ / / || arch =~ /Hz$/
-				arch = `uname -m`.strip
+				arch = `#{uname} -m`.strip
 			end
 			if arch =~ /^i.86$/
 				arch = "x86"

data/lib/phusion_passenger/platform_info/ruby.rb

@@ -23,8 +23,8 @@
 
 require 'rbconfig'
 require 'etc'
-require 'phusion_passenger/platform_info'
-require 'phusion_passenger/platform_info/operating_system'
+PhusionPassenger.require_passenger_lib 'platform_info'
+PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
 
 module PhusionPassenger
 
@@ -155,8 +155,11 @@ module PlatformInfo
 	# Returns whether running 'gem install' as the current user requires sudo.
 	def self.gem_install_requires_sudo?
 		`#{gem_command} env` =~ /INSTALLATION DIRECTORY: (.+)/
-		install_dir = $1
-		return !File.writable?(install_dir)
+		if install_dir = $1
+			return !File.writable?(install_dir)
+		else
+			return nil
+		end
 	end
 	memoize :gem_install_requires_sudo?
 	

data/lib/phusion_passenger/platform_info/zlib.rb

@@ -21,7 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'phusion_passenger/platform_info'
+PhusionPassenger.require_passenger_lib 'platform_info'
 
 module PhusionPassenger
 

data/lib/phusion_passenger/plugin.rb

@@ -21,7 +21,6 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'phusion_passenger'
 require 'etc'
 
 module PhusionPassenger

data/lib/phusion_passenger/preloader_shared_helpers.rb

@@ -23,7 +23,7 @@
 #  THE SOFTWARE.
 
 require 'socket'
-require 'phusion_passenger/native_support'
+PhusionPassenger.require_passenger_lib 'native_support'
 
 module PhusionPassenger
 

data/lib/phusion_passenger/public_api.rb

@@ -44,7 +44,7 @@ class << self
 	def install_framework_extensions!(*args)
 		require 'active_support/version' if defined?(::ActiveSupport) && !defined?(::ActiveSupport::VERSION)
 		if defined?(::ActiveSupport) && ::ActiveSupport::VERSION::MAJOR >= 3
-			require 'phusion_passenger/active_support3_extensions/init'
+			PhusionPassenger.require_passenger_lib 'active_support3_extensions/init'
 			ActiveSupport3Extensions.init!(PhusionPassenger::App.options, *args)
 		end
 	end

data/lib/phusion_passenger/rack/thread_handler_extension.rb

@@ -22,7 +22,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'phusion_passenger/utils/tee_input'
+PhusionPassenger.require_passenger_lib 'utils/tee_input'
 
 module PhusionPassenger
 module Rack

data/lib/phusion_passenger/request_handler.rb

@@ -24,15 +24,14 @@
 
 require 'socket'
 require 'fcntl'
-require 'phusion_passenger'
-require 'phusion_passenger/constants'
-require 'phusion_passenger/public_api'
-require 'phusion_passenger/message_client'
-require 'phusion_passenger/debug_logging'
-require 'phusion_passenger/utils'
-require 'phusion_passenger/utils/tmpdir'
-require 'phusion_passenger/ruby_core_enhancements'
-require 'phusion_passenger/request_handler/thread_handler'
+PhusionPassenger.require_passenger_lib 'constants'
+PhusionPassenger.require_passenger_lib 'public_api'
+PhusionPassenger.require_passenger_lib 'message_client'
+PhusionPassenger.require_passenger_lib 'debug_logging'
+PhusionPassenger.require_passenger_lib 'utils'
+PhusionPassenger.require_passenger_lib 'utils/tmpdir'
+PhusionPassenger.require_passenger_lib 'ruby_core_enhancements'
+PhusionPassenger.require_passenger_lib 'request_handler/thread_handler'
 
 module PhusionPassenger
 

data/lib/phusion_passenger/request_handler/thread_handler.rb

@@ -21,11 +21,11 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'phusion_passenger/constants'
-require 'phusion_passenger/debug_logging'
-require 'phusion_passenger/message_channel'
-require 'phusion_passenger/utils'
-require 'phusion_passenger/utils/unseekable_socket'
+PhusionPassenger.require_passenger_lib 'constants'
+PhusionPassenger.require_passenger_lib 'debug_logging'
+PhusionPassenger.require_passenger_lib 'message_channel'
+PhusionPassenger.require_passenger_lib 'utils'
+PhusionPassenger.require_passenger_lib 'utils/unseekable_socket'
 
 module PhusionPassenger
 class RequestHandler
@@ -40,11 +40,12 @@ class ThreadHandler
 	end
 
 	REQUEST_METHOD = 'REQUEST_METHOD'.freeze
+	GET            = 'GET'.freeze
 	PING           = 'PING'.freeze
 	OOBW           = 'OOBW'.freeze
 	PASSENGER_CONNECT_PASSWORD  = 'PASSENGER_CONNECT_PASSWORD'.freeze
 	CONTENT_LENGTH = 'CONTENT_LENGTH'.freeze
-	TRANSFER_ENCODING = 'TRANSFER_ENCODING'.freeze
+	HTTP_TRANSFER_ENCODING = 'HTTP_TRANSFER_ENCODING'.freeze
 
 	MAX_HEADER_SIZE = 128 * 1024
 
@@ -177,7 +178,7 @@ private
 		if connection && !connection.closed?
 			begin
 				connection.close_write
-			rescue SystemCallError
+			rescue SystemCallError, IOError
 			end
 			begin
 				connection.close
@@ -275,8 +276,7 @@ private
 #	end
 
 	def prepare_request(connection, headers)
-		if (!headers.has_key?(CONTENT_LENGTH) && !headers.has_key?(TRANSFER_ENCODING)) ||
-		  headers[CONTENT_LENGTH] == 0
+		if !may_have_request_body?(headers)
 			connection.simulate_eof!
 		end
 
@@ -384,6 +384,18 @@ private
 		end
 	end
 
+	def may_have_request_body?(headers)
+		if headers[REQUEST_METHOD] == GET
+			if content_length = headers[CONTENT_LENGTH]
+				return content_length != 0
+			else
+				return headers.has_key?(HTTP_TRANSFER_ENCODING)
+			end
+		else
+			return true
+		end
+	end
+
 	def should_reraise_error?(e)
 		# Stubable by unit tests.
 		return true