passenger 4.0.0.rc4 → 4.0.0.rc6

data/lib/phusion_passenger/classic_rails/thread_handler_extension.rb

@@ -27,7 +27,7 @@ module PhusionPassenger
 module ClassicRails
 
 module ThreadHandlerExtension
-	def process_request(env, connection, full_http_response)
+	def process_request(env, connection, socket_wrapper, full_http_response)
 		cgi = CGIFixed.new(env, connection, connection)
 		::Dispatcher.dispatch(cgi,
 			::ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS,

data/lib/phusion_passenger/native_support.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010, 2011, 2012 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -30,6 +30,7 @@ class NativeSupportLoader
 	
 	def start
 		require 'phusion_passenger'
+		load_from_native_support_output_dir ||
 		load_from_source_root ||
 		load_from_load_path ||
 		load_from_home_dir ||
@@ -74,6 +75,20 @@ private
 			return nil
 		end
 	end
+
+	def load_from_native_support_output_dir
+		output_dir = ENV['PASSENGER_NATIVE_SUPPORT_OUTPUT_DIR']
+		if output_dir && !output_dir.empty?
+			begin
+				require "#{output_dir}/#{VERSION_STRING}/#{archdir}/#{library_name}"
+				return true
+			rescue LoadError
+				return false
+			end
+		else
+			return false
+		end
+	end
 	
 	def load_from_source_root
 		if PhusionPassenger.originally_packaged?
@@ -112,6 +127,9 @@ private
 		require 'phusion_passenger/platform_info/ruby'
 		
 		target_dirs = []
+		if (output_dir = ENV['PASSENGER_NATIVE_SUPPORT_OUTPUT_DIR']) && !output_dir.empty?
+			target_dirs << "#{output_dir}/#{VERSION_STRING}/#{archdir}"
+		end
 		if native_support_dir_in_source_root
 			target_dirs << "#{native_support_dir_in_source_root}/#{archdir}"
 		end

data/lib/phusion_passenger/platform_info/compiler.rb

@@ -251,6 +251,12 @@ public
 			:c, '', '-mno-tls-direct-seg-refs')
 	end
 	memoize :compiler_supports_no_tls_direct_seg_refs_option?, true
+
+	def self.compiler_supports_wno_ambiguous_member_template?
+		return try_compile("Checking for C compiler '-Wno-ambiguous-member-template' support",
+			:c, '', '-Wno-ambiguous-member-template')
+	end
+	memoize :compiler_supports_wno_ambiguous_member_template?, true
 	
 	# Returns whether compiling C++ with -fvisibility=hidden might result
 	# in tons of useless warnings, like this:

data/lib/phusion_passenger/platform_info/ruby.rb

@@ -68,9 +68,33 @@ module PlatformInfo
 						return filename
 					end
 				end
-				STDERR.puts "Your RVM wrapper scripts are too old. Please " +
-							"update them first by running 'rvm get head && " +
-							"rvm reload && rvm repair all'."
+
+				# 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.
@@ -211,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
@@ -238,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/preloader_shared_helpers.rb

@@ -79,7 +79,14 @@ module PreloaderSharedHelpers
 		end
 		return nil
 	ensure
-		client.close if client && Process.pid == original_pid
+		if client && Process.pid == original_pid
+			begin
+				client.close
+			rescue Errno::EINVAL
+				# Work around OS X bug.
+				# https://code.google.com/p/phusion-passenger/issues/detail?id=854
+			end
+		end
 	end
 	
 	def run_main_loop(options)

data/lib/phusion_passenger/rack/out_of_band_gc.rb

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2012 Phusion
+#  Copyright (c) 2012-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -36,7 +36,9 @@ class OutOfBandGc
     
     ::PhusionPassenger.on_event(:oob_work) do
       t0 = Time.now
+      disabled = GC.enable
       GC.start
+      GC.disable if disabled
       logger.info "Out Of Band GC finished in #{Time.now - t0} sec" if logger
     end
   end

data/lib/phusion_passenger/rack/thread_handler_extension.rb

@@ -51,7 +51,7 @@ module ThreadHandlerExtension
 	STATUS         = "Status: "       # :nodoc:
 	NAME_VALUE_SEPARATOR = ": "       # :nodoc:
 
-	def process_request(env, connection, full_http_response)
+	def process_request(env, connection, socket_wrapper, full_http_response)
 		rewindable_input = PhusionPassenger::Utils::TeeInput.new(connection, env)
 		begin
 			env[RACK_VERSION]      = RACK_VERSION_VALUE
@@ -66,9 +66,26 @@ module ThreadHandlerExtension
 				env[RACK_URL_SCHEME] = HTTP
 			end
 			env[RACK_HIJACK_P] = true
-			env[RACK_HIJACK] = lambda { env[RACK_HIJACK_IO] ||= connection }
+			env[RACK_HIJACK] = lambda do
+				env[RACK_HIJACK_IO] ||= begin
+					connection.stop_simulating_eof!
+					connection
+				end
+			end
 			
-			status, headers, body = @app.call(env)
+			begin
+				status, headers, body = @app.call(env)
+			rescue => e
+				if should_reraise_app_error?(e, socket_wrapper)
+					raise e
+				elsif !should_swallow_app_error?(e, socket_wrapper)
+					# 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)
+				end
+				return false
+			end
 
 			# Application requested a full socket hijack.
 			return true if env[RACK_HIJACK_IO]
@@ -119,8 +136,18 @@ module ThreadHandlerExtension
 				else
 					connection.writev(headers_output)
 					if body
-						body.each do |s|
-							connection.write(s)
+						begin
+							body.each do |s|
+								connection.write(s)
+							end
+						rescue => e
+							if should_reraise_app_error?(e, socket_wrapper)
+								raise e
+							elsif !should_swallow_app_error?(e, socket_wrapper)
+								# Body objects can raise exceptions in #each.
+								print_exception("Rack body object #each method", e)
+							end
+							return false
 						end
 					end
 					return false

data/lib/phusion_passenger/request_handler/thread_handler.rb

@@ -35,12 +35,15 @@ class RequestHandler
 # This class encapsulates the logic of a single RequestHandler thread.
 class ThreadHandler
 	include DebugLogging
+	include Utils
 	include Utils::RobustInterruption
 
 	REQUEST_METHOD = 'REQUEST_METHOD'.freeze
 	PING           = 'PING'.freeze
 	OOBW           = 'OOBW'.freeze
 	PASSENGER_CONNECT_PASSWORD  = 'PASSENGER_CONNECT_PASSWORD'.freeze
+	CONTENT_LENGTH = 'CONTENT_LENGTH'.freeze
+	TRANSFER_ENCODING = 'TRANSFER_ENCODING'.freeze
 
 	MAX_HEADER_SIZE = 128 * 1024
 
@@ -122,14 +125,14 @@ private
 		trace(3, "Accepted new request on socket #{@socket_name}")
 		channel.io = connection
 		if headers = parse_request(connection, channel, buffer)
-			prepare_request(headers)
+			prepare_request(connection, headers)
 			begin
 				if headers[REQUEST_METHOD] == PING
 					process_ping(headers, connection)
 				elsif headers[REQUEST_METHOD] == OOBW
 					process_oobw(headers, connection)
 				else
-					process_request(headers, connection, @protocol == :http)
+					process_request(headers, connection, socket_wrapper, @protocol == :http)
 				end
 			rescue Exception
 				has_error = true
@@ -140,7 +143,7 @@ private
 					connection = nil
 					channel = nil
 				end
-				finalize_request(headers, has_error)
+				finalize_request(connection, headers, has_error)
 				trace(3, "Request done.")
 			end
 		else
@@ -152,7 +155,7 @@ private
 			# Other errors might indicate a problem so we print them, but they're
 			# probably not bad enough to warrant stopping the request handler.
 			if !e.is_a?(Errno::EPIPE)
-				Utils.print_exception("Passenger RequestHandler's client socket", e)
+				print_exception("Passenger RequestHandler's client socket", e)
 			end
 		else
 			if @analytics_logger && headers && headers[PASSENGER_TXN_ID]
@@ -236,7 +239,7 @@ private
 				header, value = line.split(/\s*:\s*/, 2)
 				header.upcase!            # "Foo-Bar" => "FOO-BAR"
 				header.gsub!("-", "_")    #           => "FOO_BAR"
-				if header == "CONTENT_LENGTH" || header == "CONTENT_TYPE"
+				if header == CONTENT_LENGTH || header == "CONTENT_TYPE"
 					headers[header] = value
 				else
 					headers["HTTP_#{header}"] = value
@@ -264,11 +267,16 @@ private
 		connection.write("oobw done")
 	end
 
-#	def process_request(env, connection, full_http_response)
+#	def process_request(env, connection, socket_wrapper, full_http_response)
 #		raise NotImplementedError, "Override with your own implementation!"
 #	end
 
-	def prepare_request(headers)
+	def prepare_request(connection, headers)
+		if (!headers.has_key?(CONTENT_LENGTH) && !headers.has_key?(TRANSFER_ENCODING)) ||
+		  headers[CONTENT_LENGTH] == 0
+			connection.simulate_eof!
+		end
+
 		if @analytics_logger && headers[PASSENGER_TXN_ID]
 			txn_id = headers[PASSENGER_TXN_ID]
 			union_station_key = headers[PASSENGER_UNION_STATION_KEY]
@@ -297,7 +305,11 @@ private
 		#################
 	end
 	
-	def finalize_request(headers, has_error)
+	def finalize_request(connection, headers, has_error)
+		if connection
+			connection.stop_simulating_eof!
+		end
+
 		log = headers[PASSENGER_ANALYTICS_WEB_LOG]
 		if log && !log.closed?
 			exception_occurred = false
@@ -373,6 +385,14 @@ private
 		# Stubable by unit tests.
 		return true
 	end
+
+	def should_reraise_app_error?(e, socket_wrapper)
+		return false
+	end
+
+	def should_swallow_app_error?(e, socket_wrapper)
+		return socket_wrapper && socket_wrapper.source_of_exception?(e) && e.is_a?(Errno::EPIPE)
+	end
 end
 
 

data/lib/phusion_passenger/ruby_core_enhancements.rb

@@ -43,8 +43,16 @@ class Exception
 		else
 			location = "in #{current_location} "
 		end
+		current_thread = Thread.current
+		if !(thread_id = current_thread[:id])
+			current_thread.to_s =~ /:(0x[0-9a-f]+)/i
+			thread_id = $1 || '?'
+		end
+		if thread_name = current_thread[:name]
+			thread_name = "(#{thread_name})"
+		end
 		return "*** Exception #{self.class} #{location}" <<
-			"(#{self}) (process #{$$}, thread #{Thread.current}):\n" <<
+			"(#{self}) (process #{$$}, thread #{thread_id}#{thread_name}):\n" <<
 			"\tfrom " << backtrace.join("\n\tfrom ")
 	end
 end

data/lib/phusion_passenger/standalone/runtime_installer.rb

@@ -545,6 +545,7 @@ private
 				"--without-http_scgi_module " <<
 				"--without-http_uwsgi_module " <<
 				"--with-http_gzip_static_module " <<
+				"--with-http_stub_status_module " <<
 				"'--add-module=#{PhusionPassenger.source_root}/ext/nginx'"
 			run_command_with_throbber(command, "Preparing Nginx...") do |status_text|
 				yield(0, 1, status_text)

data/lib/phusion_passenger/utils/unseekable_socket.rb

@@ -26,14 +26,14 @@ require 'phusion_passenger/utils'   # So that we can know whether #writev is sup
 module PhusionPassenger
 module Utils
 
-# Some frameworks (e.g. Merb) call _seek_ and _rewind_ on the input stream
+# Some frameworks (e.g. Merb) call `seek` and `rewind` on the input stream
 # if it responds to these methods. In case of Phusion Passenger, the input
-# stream is a socket, and altough socket objects respond to _seek_ and
-# _rewind_, calling these methods will raise an exception. We don't want
+# stream is a socket, and altough socket objects respond to `seek` and
+# `rewind`, calling these methods will raise an exception. We don't want
 # this to happen so in AbstractRequestHandler we wrap the client socket
 # into an UnseekableSocket wrapper, which doesn't respond to these methods.
 #
-# We used to dynamically undef _seek_ and _rewind_ on sockets, but this
+# We used to dynamically undef `seek` and `rewind` on sockets, but this
 # blows the Ruby interpreter's method cache and made things slower.
 # Wrapping a socket is faster despite extra method calls.
 #
@@ -87,8 +87,21 @@ class UnseekableSocket
 	def binmode
 	end
 	
+	# This makes select() work.
 	def to_io
-		self
+		@socket
+	end
+
+	def simulate_eof!
+		@simulate_eof = true
+	end
+
+	def stop_simulating_eof!
+		@simulate_eof = false
+	end
+
+	def fileno
+		@socket.fileno
 	end
 	
 	def addr
@@ -128,36 +141,54 @@ class UnseekableSocket
 	end
 	
 	def gets
+		return nil if @simulate_eof
 		@socket.gets
 	rescue => e
 		raise annotate(e)
 	end
 	
 	def read(*args)
+		if @simulate_eof
+			length, buffer = args
+			if buffer
+				buffer.replace(binary_string(""))
+			else
+				buffer = binary_string("")
+			end
+			if length
+				return nil
+			else
+				return buffer
+			end
+		end
 		@socket.read(*args)
 	rescue => e
 		raise annotate(e)
 	end
 	
 	def readpartial(*args)
+		raise EOFError, "end of file reached" if @simulate_eof
 		@socket.readpartial(*args)
 	rescue => e
 		raise annotate(e)
 	end
 	
 	def readline
+		raise EOFError, "end of file reached" if @simulate_eof
 		@socket.readline
 	rescue => e
 		raise annotate(e)
 	end
 	
 	def each(&block)
+		return if @simulate_eof
 		@socket.each(&block)
 	rescue => e
 		raise annotate(e)
 	end
 
 	def eof?
+		return true if @simulate_eof
 		@socket.eof?
 	rescue => e
 		raise annotate(e)
@@ -196,6 +227,20 @@ private
 		exception.instance_variable_set(:"@from_unseekable_socket", @socket.object_id)
 		return exception
 	end
+
+	def raise_error_because_activity_disallowed!
+		raise IOError, "It is not possible to read or write from the client socket because the current."
+	end
+
+	if ''.respond_to?(:force_encoding)
+		def binary_string(str)
+			return ''.force_encoding('binary')
+		end
+	else
+		def binary_string(str)
+			return ''
+		end
+	end
 end
 
 end # module Utils