passenger 3.0.19 → 3.0.21

data/lib/phusion_passenger.rb

@@ -25,9 +25,9 @@ module PhusionPassenger
 	###### Version numbers ######
 	
 	# Phusion Passenger version number. Don't forget to edit ext/common/Constants.h too.
-	VERSION_STRING = '3.0.19'
+	VERSION_STRING = '3.0.21'
 	
-	PREFERRED_NGINX_VERSION = '1.2.6'
+	PREFERRED_NGINX_VERSION = '1.2.9'
 	PREFERRED_PCRE_VERSION  = '8.31'
 	STANDALONE_INTERFACE_VERSION  = 1
 	

data/lib/phusion_passenger/abstract_request_handler.rb

@@ -453,6 +453,9 @@ private
 			trap(signal, handler)
 		end
 	end
+
+	class IgnoreException < StandardError
+	end
 	
 	def accept_and_process_next_request(socket_wrapper, channel, buffer)
 		select_result = select(@selectable_sockets, nil, nil, @select_timeout)
@@ -509,17 +512,20 @@ private
 		
 		if headers
 			prepare_request(headers)
+			ignore = false
 			begin
 				if headers[REQUEST_METHOD] == PING
 					process_ping(headers, input_stream, connection)
 				else
 					process_request(headers, input_stream, connection, full_http_response)
 				end
+			rescue IgnoreException
+				ignore = true
 			rescue Exception
 				has_error = true
 				raise
 			ensure
-				finalize_request(headers, has_error)
+				finalize_request(headers, has_error) if !ignore
 			end
 		end
 		return true

data/lib/phusion_passenger/dependencies.rb

@@ -22,6 +22,7 @@
 #  THE SOFTWARE.
 
 require 'rbconfig'
+require 'tmpdir'
 require 'phusion_passenger'
 require 'phusion_passenger/packaging'
 require 'phusion_passenger/platform_info'
@@ -117,6 +118,12 @@ module Dependencies # :nodoc: all
 		end
 	end
 
+	def self.create_temp_files(name1, name2, dir = PlatformInfo.tmpexedir)
+		Dir.mktmpdir("passenger.", dir) do |subdir|
+			yield "#{subdir}/#{name1}", "#{subdir}/#{name2}"
+		end
+	end
+
 	GCC = Dependency.new do |dep|
 		dep.name = "GNU C++ compiler"
 		dep.define_checker do |result|
@@ -456,9 +463,7 @@ module Dependencies # :nodoc: all
 	Curl_Dev = Dependency.new do |dep|
 		dep.name = "Curl development headers with SSL support"
 		dep.define_checker do |result|
-			source_file = "#{PlatformInfo.tmpexedir}/passenger-curl-check.c"
-			output_file = "#{PlatformInfo.tmpexedir}/passenger-curl-check"
-			begin
+			Dependencies.create_temp_files("check.c", "check") do |source_file, output_file|
 				found = true
 				File.open(source_file, 'w') do |f|
 					f.puts("#include <curl/curl.h>")
@@ -482,9 +487,6 @@ module Dependencies # :nodoc: all
 					found = false
 				end
 				result.found(found)
-			ensure
-				File.unlink(source_file) rescue nil
-				File.unlink(output_file) rescue nil
 			end
 		end
 		dep.install_instructions = "Please download Curl from <b>http://curl.haxx.se/libcurl</b> " +
@@ -514,22 +516,17 @@ module Dependencies # :nodoc: all
 	OpenSSL_Dev = Dependency.new do |dep|
 		dep.name = "OpenSSL development headers"
 		dep.define_checker do |result|
-			source_file = "#{PlatformInfo.tmpexedir}/passenger-openssl-check.c"
-			object_file = "#{PlatformInfo.tmpexedir}/passenger-openssl-check.o"
-			begin
+			Dependencies.create_temp_files("check.c", "check.o") do |source_file, output_file|
 				File.open(source_file, 'w') do |f|
 					f.write("#include <openssl/ssl.h>")
 				end
 				Dir.chdir(File.dirname(source_file)) do
-					if system("(gcc #{ENV['CFLAGS']} -c '#{source_file}') >/dev/null 2>/dev/null")
+					if system("(gcc #{ENV['CFLAGS']} -c '#{source_file}' -o '#{output_file}') >/dev/null 2>/dev/null")
 						result.found
 					else
 						result.not_found
 					end
 				end
-			ensure
-				File.unlink(source_file) rescue nil
-				File.unlink(object_file) rescue nil
 			end
 		end
 		if RUBY_PLATFORM =~ /linux/
@@ -546,22 +543,17 @@ module Dependencies # :nodoc: all
 	Zlib_Dev = Dependency.new do |dep|
 		dep.name = "Zlib development headers"
 		dep.define_checker do |result|
-			source_file = "#{PlatformInfo.tmpexedir}/zlib-check.c"
-			object_file = "#{PlatformInfo.tmpexedir}/zlib-check.o"
-			begin
+			Dependencies.create_temp_files("check.c", "check.o") do |source_file, output_file|
 				File.open(source_file, 'w') do |f|
 					f.write("#include <zlib.h>")
 				end
 				Dir.chdir(File.dirname(source_file)) do
-					if system("(g++ -c zlib-check.c) >/dev/null 2>/dev/null")
+					if system("(g++ -c '#{source_file}' -o '#{output_file}') >/dev/null 2>/dev/null")
 						result.found
 					else
 						result.not_found
 					end
 				end
-			ensure
-				File.unlink(source_file) rescue nil
-				File.unlink(object_file) rescue nil
 			end
 		end
 		if RUBY_PLATFORM =~ /linux/

data/lib/phusion_passenger/platform_info.rb

@@ -21,6 +21,8 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+require 'tmpdir'
+
 module PhusionPassenger
 
 # This module autodetects various platform-specific information, and
@@ -263,15 +265,12 @@ public
 		else
 			raise ArgumentError,"Unsupported language '#{language}'"
 		end
-		filename = File.join("#{tmpexedir}/passenger-compile-check-#{Process.pid}.c")
-		File.open(filename, "w") do |f|
-			f.puts(source)
-		end
-		begin
+		Dir.mktmpdir("passenger.", tmpexedir) do |dir|
+			filename = File.join(dir, "check.c")
+			File.open(filename, "w") do |f|
+				f.puts(source)
+			end
 			return system("(#{compiler} #{flags} -c '#{filename}' -o '#{filename}.o') >/dev/null 2>/dev/null")
-		ensure
-			File.unlink(filename) rescue nil
-			File.unlink("#{filename}.o") rescue nil
 		end
 	end
 	private_class_method :try_compile
@@ -284,15 +283,12 @@ public
 		else
 			raise ArgumentError,"Unsupported language '#{language}'"
 		end
-		filename = File.join("#{tmpexedir}/passenger-link-check-#{Process.pid}.c")
-		File.open(filename, "w") do |f|
-			f.puts(source)
-		end
-		begin
+		Dir.mktmpdir("passenger.", tmpexedir) do |dir|
+			filename = File.join(dir, "check.c")
+			File.open(filename, "w") do |f|
+				f.puts(source)
+			end
 			return system("(#{compiler} #{flags} '#{filename}' -o '#{filename}.out') >/dev/null 2>/dev/null")
-		ensure
-			File.unlink(filename) rescue nil
-			File.unlink("#{filename}.out") rescue nil
 		end
 	end
 	private_class_method :try_link
@@ -305,17 +301,16 @@ public
 		else
 			raise ArgumentError,"Unsupported language '#{language}'"
 		end
-		filename = File.join("#{tmpexedir}/passenger-compile-check-#{Process.pid}.c")
-		File.open(filename, "w") do |f|
-			f.puts(source)
-		end
-		begin
+		Dir.mktmpdir("passenger.", tmpexedir) do |dir|
+			filename = File.join(dir, "check.c")
+			File.open(filename, "w") do |f|
+				f.puts(source)
+			end
 			if system("(#{compiler} #{flags} '#{filename}' -o '#{filename}.out') >/dev/null 2>/dev/null")
 				if Process.respond_to?(:spawn)
 					pid = Process.spawn("#{filename}.out",
 						:out => ["/dev/null", "w"],
 						:err => ["/dev/null", "w"])
-					
 				else
 					pid = fork do
 						STDOUT.reopen("/dev/null", "w")
@@ -328,9 +323,6 @@ public
 			else
 				return false
 			end
-		ensure
-			File.unlink(filename) rescue nil
-			File.unlink("#{filename}.out") rescue nil
 		end
 	end
 	private_class_method :try_compile_and_run

data/lib/phusion_passenger/platform_info/apache.rb

@@ -285,16 +285,7 @@ module PlatformInfo
 	# headers are placed into the same directory as the Apache headers,
 	# and so 'apr-config' and 'apu-config' won't be necessary in that case.
 	def self.apr_config_needed_for_building_apache_modules?
-		filename = File.join("#{tmpexedir}/passenger-platform-check-#{Process.pid}.c")
-		File.open(filename, "w") do |f|
-			f.puts("#include <apr.h>")
-		end
-		begin
-			return !system("(gcc #{apache2_module_cflags(false)} -c '#{filename}' -o '#{filename}.o') >/dev/null 2>/dev/null")
-		ensure
-			File.unlink(filename) rescue nil
-			File.unlink("#{filename}.o") rescue nil
-		end
+		return !try_compile(:c, "#include <apr.h>", apache2_module_cflags(false))
 	end
 	memoize :apr_config_needed_for_building_apache_modules?
 

data/lib/phusion_passenger/platform_info/ruby.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
@@ -48,29 +48,54 @@ module PlatformInfo
 	def self.ruby_command
 		if in_rvm?
 			name = rvm_ruby_string
-			dir = rvm_path
-			if name && dir
-				filename = "#{dir}/wrappers/#{name}/ruby"
-				if File.exist?(filename)
-					contents = File.open(filename, 'rb') do |f|
-						f.read
-					end
-					# Old wrapper scripts reference $HOME which causes
-					# things to blow up when run by a different user.
-					if contents.include?("$HOME")
+			dirs = rvm_paths
+			if name && dirs
+				dirs.each do |dir|
+					filename = "#{dir}/wrappers/#{name}/ruby"
+					if File.exist?(filename)
+						contents = File.open(filename, 'rb') do |f|
+							f.read
+						end
+						# Old wrapper scripts reference $HOME which causes
+						# things to blow up when run by a different user.
+						if contents.include?("$HOME")
+							filename = nil
+						end
+					else
 						filename = nil
 					end
-				else
-					filename = nil
+					if filename
+						return filename
+					end
 				end
-				if filename
-					return filename
-				else
-					STDERR.puts "Your RVM wrapper scripts are too old. Please " +
-						"update them first by running 'rvm get head && " +
-						"rvm reload && rvm repair all'."
-					exit 1
+
+				# Correctness of these commands are confirmed by mpapis.
+				# If we ever encounter a case for which this logic is not sufficient,
+				# try mpapis' pseudo code:
+				# 
+				#   rvm_update_prefix  = write_to rvm_path ? "" : "rvmsudo"
+				#   rvm_gemhome_prefix  = write_to GEM_HOME ? "" : "rvmsudo"
+				#   repair_command  = "#{rvm_update_prefix} rvm get stable && rvm reload && #{rvm_gemhome_prefix} rvm repair all"
+				#   wrapper_command = "#{rvm_gemhome_prefix} rvm wrapper #{rvm_ruby_string} --no-prefix --all"
+				case rvm_installation_mode
+				when :single
+					repair_command  = "rvm get stable && rvm reload && rvm repair all"
+					wrapper_command = "rvm wrapper #{rvm_ruby_string} --no-prefix --all"
+				when :multi
+					repair_command  = "rvmsudo rvm get stable && rvm reload && rvmsudo rvm repair all"
+					wrapper_command = "rvmsudo rvm wrapper #{rvm_ruby_string} --no-prefix --all"
+				when :mixed
+					repair_command  = "rvmsudo rvm get stable && rvm reload && rvm repair all"
+					wrapper_command = "rvm wrapper #{rvm_ruby_string} --no-prefix --all"
 				end
+
+				STDERR.puts "Your RVM wrapper scripts are too old, or some " +
+					"wrapper scripts are missing. Please update/regenerate " +
+					"them first by running:\n\n" +
+					"  #{repair_command}\n\n" +
+					"If that doesn't seem to work, please run:\n\n" +
+					"  #{wrapper_command}"
+				exit 1
 			else
 				# Something's wrong with the user's RVM installation.
 				# Raise an error so that the user knows this instead of
@@ -105,7 +130,7 @@ module PlatformInfo
 			RUBY_ENGINE != "macruby" &&
 			rb_config['target_os'] !~ /mswin|windows|mingw/
 	end
-	
+
 	# Returns the correct 'gem' command for this Ruby interpreter.
 	def self.gem_command
 		return locate_ruby_tool('gem')
@@ -156,29 +181,39 @@ module PlatformInfo
 		return bindir.include?('/.rvm/') || bindir.include?('/rvm/')
 	end
 	
-	# If the current Ruby interpreter is managed by RVM, returns the
-	# directory in which RVM places its working files. Otherwise returns
-	# nil.
-	def self.rvm_path
+	# If the current Ruby interpreter is managed by RVM, returns all
+	# directories in which RVM places its working files. This is usually
+	# ~/.rvm or /usr/local/rvm, but in mixed-mode installations there
+	# can be multiple such paths.
+	# 
+	# Otherwise returns nil.
+	def self.rvm_paths
 		if in_rvm?
+			result = []
 			[ENV['rvm_path'], "~/.rvm", "/usr/local/rvm"].each do |path|
 				next if path.nil?
 				path = File.expand_path(path)
-				script_path = File.join(path, 'scripts', 'rvm')
-				return path if File.directory?(path) && File.exist?(script_path)
+				rubies_path = File.join(path, 'rubies')
+				if File.directory?(path) && File.directory?(rubies_path)
+					result << path
+				end
+			end
+			if result.empty?
+				# Failure to locate the RVM path is probably caused by the
+				# user customizing $rvm_path. Older RVM versions don't
+				# export $rvm_path, making us unable to detect its value.
+				STDERR.puts "Unable to locate the RVM path. Your RVM installation " +
+					"is probably too old. Please update it with " +
+					"'rvm get head && rvm reload && rvm repair all'."
+				exit 1
+			else
+				return result
 			end
-			# Failure to locate the RVM path is probably caused by the
-			# user customizing $rvm_path. Older RVM versions don't
-			# export $rvm_path, making us unable to detect its value.
-			STDERR.puts "Unable to locate the RVM path. Your RVM installation " +
-				"is probably too old. Please update it with " +
-				"'rvm get head && rvm reload && rvm repair all'."
-			exit 1
 		else
 			return nil
 		end
 	end
-	memoize :rvm_path
+	memoize :rvm_paths
 	
 	# If the current Ruby interpreter is managed by RVM, returns the
 	# RVM name which identifies the current Ruby interpreter plus the
@@ -200,8 +235,12 @@ module PlatformInfo
 			# try various strategies...
 			
 			# $GEM_HOME usually contains the gem set name.
-			if GEM_HOME && GEM_HOME.include?("rvm/gems/")
-				return File.basename(GEM_HOME)
+			# It may be something like:
+			#   /Users/hongli/.rvm/gems/ruby-1.9.3-p392
+			# But also:
+			#   /home/bitnami/.rvm/gems/ruby-1.9.3-p385-perf@njist325/ruby/1.9.1
+			if GEM_HOME && GEM_HOME =~ %r{rvm/gems/(.+)}
+				return $1.sub(/\/.*/, '')
 			end
 			
 			# User somehow managed to nuke $GEM_HOME. Extract info
@@ -227,6 +266,27 @@ module PlatformInfo
 		return nil
 	end
 	memoize :rvm_ruby_string
+
+	# Returns the RVM installation mode:
+	# :single - RVM is installed in single-user mode.
+	# :multi  - RVM is installed in multi-user mode.
+	# :mixed  - RVM is in a mixed-mode installation.
+	# nil     - The current Ruby interpreter is not using RVM.
+	def self.rvm_installation_mode
+		if in_rvm?
+			if ENV['rvm_path'] =~ /\.rvm/
+				return :single
+			else
+				if GEM_HOME =~ /\.rvm/
+					return :mixed
+				else
+					return :multi
+				end
+			end
+		else
+			return nil
+		end
+	end
 	
 	# Returns either 'sudo' or 'rvmsudo' depending on whether the current
 	# Ruby interpreter is managed by RVM.

data/lib/phusion_passenger/rack/request_handler.rb

@@ -93,7 +93,21 @@ protected
 				env[RACK_URL_SCHEME] = HTTP
 			end
 			
-			status, headers, body = @app.call(env)
+			begin
+				status, headers, body = @app.call(env)
+			rescue => e
+				socket_wrapper = output
+				if socket_wrapper.source_of_exception?(e)
+					# Handled by AbstractRequestHandler
+					raise e
+				else
+					# It's a good idea to catch application exceptions here because
+					# otherwise maliciously crafted responses can crash the app,
+					# forcing it to be respawned, and thereby effectively DoSing it.
+					print_exception("Rack application object", e)
+					raise AbstractRequestHandler::IgnoreException.new
+				end
+			end
 			begin
 				if full_http_response
 					output.write("HTTP/1.1 #{status.to_i.to_s} Whatever#{CRLF}")
@@ -139,6 +153,11 @@ protected
 			rewindable_input.close
 		end
 	end
+
+private
+	def should_swallow_app_error?(e, socket_wrapper)
+		return socket_wrapper && socket_wrapper.source_of_exception?(e) && e.is_a?(Errno::EPIPE)
+	end
 end
 
 end # module Rack