passenger 4.0.60 → 5.0.0.beta1

data/lib/phusion_passenger/request_handler.rb

@@ -30,8 +30,8 @@ PhusionPassenger.require_passenger_lib 'message_client'
 PhusionPassenger.require_passenger_lib 'debug_logging'
 PhusionPassenger.require_passenger_lib 'native_support'
 PhusionPassenger.require_passenger_lib 'utils'
-PhusionPassenger.require_passenger_lib 'utils/tmpdir'
 PhusionPassenger.require_passenger_lib 'ruby_core_enhancements'
+PhusionPassenger.require_passenger_lib 'ruby_core_io_enhancements'
 PhusionPassenger.require_passenger_lib 'request_handler/thread_handler'
 
 module PhusionPassenger
@@ -40,17 +40,15 @@ module PhusionPassenger
 class RequestHandler
 	include DebugLogging
 	include Utils
-	
-	# Signal which will cause the Rails application to exit immediately.
+
+	# Signal which will cause the application to exit immediately.
 	HARD_TERMINATION_SIGNAL = "SIGTERM"
-	# Signal which will cause the Rails application to exit as soon as it's done processing a request.
-	SOFT_TERMINATION_SIGNAL = "SIGUSR1"
 	BACKLOG_SIZE    = 500
-	
+
 	# String constants which exist to relieve Ruby's garbage collector.
 	IGNORE              = 'IGNORE'              # :nodoc:
 	DEFAULT             = 'DEFAULT'             # :nodoc:
-	
+
 	# A hash containing all server sockets that this request handler listens on.
 	# The hash is in the form of:
 	#
@@ -68,49 +66,37 @@ class RequestHandler
 	attr_reader :server_sockets
 
 	attr_reader :concurrency
-	
-	# If a soft termination signal was received, then the main loop will quit
-	# the given amount of seconds after the last time a connection was accepted.
-	# Defaults to 3 seconds.
-	attr_accessor :soft_termination_linger_time
-	
+
 	# A password with which clients must authenticate. Default is unauthenticated.
 	attr_accessor :connect_password
-	
+
 	# Create a new RequestHandler with the given owner pipe.
 	# +owner_pipe+ must be the readable part of a pipe IO object.
 	#
 	# Additionally, the following options may be given:
-	# - detach_key
 	# - connect_password
-	# - pool_account_username
-	# - pool_account_password_base64
 	def initialize(owner_pipe, options = {})
 		require_option(options, "app_group_name")
 		install_options_as_ivars(self, options,
 			"app",
 			"app_group_name",
 			"connect_password",
-			"detach_key",
-			"union_station_core",
-			"pool_account_username"
+			"union_station_core"
 		)
 
+		@keepalive = options.fetch("keepalive", true).to_s == "true"
 		@force_http_session = ENV["_PASSENGER_FORCE_HTTP_SESSION"] == "true"
 		if @force_http_session
 			@connect_password = nil
 		end
 		@thread_handler = options["thread_handler"] || ThreadHandler
 		@concurrency = 1
-		if options["pool_account_password_base64"]
-			@pool_account_password = options["pool_account_password_base64"].unpack('m').first
-		end
 
 		#############
 		#############
 
 		@server_sockets = {}
-		
+
 		if should_use_unix_sockets?
 			@main_socket_address, @main_socket = create_unix_socket_on_filesystem(options)
 		else
@@ -139,12 +125,11 @@ class RequestHandler
 		@main_loop_thread_cond = ConditionVariable.new
 		@threads = []
 		@threads_mutex = Mutex.new
-		@soft_termination_linger_time = 3
 		@main_loop_running  = false
-		
+
 		#############
 	end
-	
+
 	# Clean up temporary stuff created by the request handler.
 	#
 	# If the main loop was started by #main_loop, then this method may only
@@ -163,7 +148,15 @@ class RequestHandler
 			socket = info[:socket]
 			type = get_socket_address_type(info[:address])
 
-			socket.close if !socket.closed?
+			begin
+				socket.close if !socket.closed?
+			rescue Exception => e
+				# Ignore "stream closed" error, which occurs in some unit tests.
+				# We catch Exception here instead of IOError because of a Ruby 1.8.7 bug.
+				if e.to_s !~ /stream closed/ && e.message.to_s !~ /stream closed/
+					raise e
+				end
+			end
 			if type == :unix
 				filename = info[:address].sub(/^unix:/, '')
 				File.unlink(filename) rescue nil
@@ -171,14 +164,14 @@ class RequestHandler
 		end
 		@owner_pipe.close rescue nil
 	end
-	
+
 	# Check whether the main loop's currently running.
 	def main_loop_running?
 		@main_loop_thread_lock.synchronize do
 			return @main_loop_running
 		end
 	end
-	
+
 	# Enter the request handler's main loop.
 	def main_loop
 		debug("Entering request handler main loop")
@@ -187,14 +180,14 @@ class RequestHandler
 			@graceful_termination_pipe = IO.pipe
 			@graceful_termination_pipe[0].close_on_exec!
 			@graceful_termination_pipe[1].close_on_exec!
-			
+
 			@main_loop_thread_lock.synchronize do
 				@main_loop_generation += 1
 				@main_loop_running = true
 				@main_loop_thread_cond.broadcast
-				
+
 				@select_timeout = nil
-				
+
 				@selectable_sockets = []
 				@server_sockets.each_value do |value|
 					socket = value[2]
@@ -203,7 +196,7 @@ class RequestHandler
 				@selectable_sockets << @owner_pipe
 				@selectable_sockets << @graceful_termination_pipe[0]
 			end
-			
+
 			install_useful_signal_handlers
 			start_threads
 			wait_until_termination_requested
@@ -219,8 +212,7 @@ class RequestHandler
 			trace(2, "Request handler main loop interrupted by Interrupt exception")
 		rescue SignalException => signal
 			trace(2, "Request handler main loop interrupted by SignalException")
-			if signal.message != HARD_TERMINATION_SIGNAL &&
-			   signal.message != SOFT_TERMINATION_SIGNAL
+			if signal.message != HARD_TERMINATION_SIGNAL
 				raise
 			end
 		rescue Exception => e
@@ -239,7 +231,7 @@ class RequestHandler
 			end
 		end
 	end
-	
+
 	# Start the main loop in a new thread. This thread will be stopped by #cleanup.
 	def start_main_loop_thread
 		current_generation = @main_loop_generation
@@ -256,31 +248,6 @@ class RequestHandler
 			end
 		end
 	end
-	
-	# Remove this request handler from the application pool so that no
-	# new connections will come in. Then make the main loop quit a few
-	# seconds after the last time a connection came in. This all is to
-	# ensure that no connections come in while we're shutting down.
-	#
-	# May only be called while the main loop is running. May be called
-	# from any thread.
-	def soft_shutdown
-		@soft_termination_linger_thread ||= Thread.new do
-			debug("Soft termination initiated")
-			if @detach_key && @pool_account_username && @pool_account_password
-				client = MessageClient.new(@pool_account_username, @pool_account_password)
-				begin
-					client.pool_detach_process_by_key(@detach_key)
-				ensure
-					client.close
-				end
-			end
-			wait_until_all_threads_are_idle
-			debug("Soft terminating in #{@soft_termination_linger_time} seconds")
-			sleep @soft_termination_linger_time
-			@graceful_termination_pipe[1].close rescue nil
-		end
-	end
 
 private
 	def should_use_unix_sockets?
@@ -308,7 +275,7 @@ private
 		# if something like this ever happens again, we know why, and we
 		# can easily reactivate the workaround. Or maybe if we just need
 		# TCP sockets for some other reason.
-		
+
 		#return RUBY_PLATFORM !~ /darwin/
 
 		ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
@@ -323,10 +290,10 @@ private
 		if defined?(NativeSupport)
 			unix_path_max = NativeSupport::UNIX_PATH_MAX
 		else
-			unix_path_max = options.fetch('UNIX_PATH_MAX', 100)
+			unix_path_max = options.fetch('UNIX_PATH_MAX', 100).to_i
 		end
-		if options['generation_dir']
-			socket_dir = "#{options['generation_dir']}/backends"
+		if options['socket_dir']
+			socket_dir = options['socket_dir']
 			socket_prefix = "ruby"
 		else
 			socket_dir = Dir.tmpdir
@@ -338,17 +305,22 @@ private
 			socket_address = socket_address.slice(0, unix_path_max - 10)
 			socket = UNIXServer.new(socket_address)
 			socket.listen(BACKLOG_SIZE)
+			socket.binmode
+			socket.sync = true
 			socket.close_on_exec!
 			File.chmod(0600, socket_address)
 			["unix:#{socket_address}", socket]
 		end
 	end
-	
+
 	def create_tcp_socket
 		# We use "127.0.0.1" as address in order to force
 		# TCPv4 instead of TCPv6.
 		socket = TCPServer.new('127.0.0.1', 0)
 		socket.listen(BACKLOG_SIZE)
+		socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+		socket.binmode
+		socket.sync = true
 		socket.close_on_exec!
 		socket_address = "tcp://127.0.0.1:#{socket.addr[1]}"
 		return [socket_address, socket]
@@ -371,18 +343,10 @@ private
 		trap('HUP', IGNORE)
 		PhusionPassenger.call_event(:after_installing_signal_handlers)
 	end
-	
+
 	def install_useful_signal_handlers
 		trappable_signals = Signal.list_trappable
-		
-		trap(SOFT_TERMINATION_SIGNAL) do
-			begin
-				soft_shutdown
-			rescue => e
-				print_exception("Passenger RequestHandler soft shutdown routine", e)
-			end
-		end if trappable_signals.has_key?(SOFT_TERMINATION_SIGNAL.sub(/^SIG/, ''))
-		
+
 		trap('ABRT') do
 			print_status_report
 		end if trappable_signals.has_key?('ABRT')
@@ -390,7 +354,7 @@ private
 			print_status_report
 		end if trappable_signals.has_key?('QUIT')
 	end
-	
+
 	def revert_signal_handlers
 		@previous_signal_handlers.each_pair do |signal, handler|
 			trap(signal, handler)
@@ -407,7 +371,8 @@ private
 			:app              => @app,
 			:app_group_name   => @app_group_name,
 			:connect_password => @connect_password,
-			:union_station_core => @union_station_core
+			:union_station_core => @union_station_core,
+			:keepalive_enabled  => @keepalive
 		}
 		main_socket_options = common_options.merge(
 			:server_socket => @main_socket,
@@ -585,13 +550,13 @@ private
 		end
 		debug("All threads stopped")
 	end
-	
+
 	def wait_until_all_threads_are_idle
 		debug("Waiting until all threads have become idle...")
 
 		# We wait until 100 ms have passed since all handlers have become
 		# interruptable and remained in the same iterations.
-		
+
 		done = false
 
 		while !done
@@ -614,7 +579,7 @@ private
 
 			start_time = Time.now
 			sleep 0.01
-			
+
 			while true
 				if handlers.size != @threads_mutex.synchronize { @threads.size }
 					debug("The number of threads changed. Restarting waiting algorithm")

data/lib/phusion_passenger/request_handler/thread_handler.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2013 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -46,6 +46,7 @@ class ThreadHandler
 	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
 
@@ -69,7 +70,8 @@ class ThreadHandler
 		Utils.install_options_as_ivars(self, options,
 			:app,
 			:union_station_core,
-			:connect_password
+			:connect_password,
+			:keepalive_enabled
 		)
 
 		@stats_mutex   = Mutex.new
@@ -123,17 +125,30 @@ private
 		@stats_mutex.synchronize do
 			@interruptable = true
 		end
-		connection = socket_wrapper.wrap(@server_socket.accept)
+		if @last_connection
+			connection = @last_connection
+			channel.io = connection
+			@last_connection = nil
+			headers = parse_request(connection, channel, buffer)
+		else
+			connection = socket_wrapper.wrap(@server_socket.accept)
+		end
 		@stats_mutex.synchronize do
 			@interruptable = false
 			@iteration    += 1
 		end
 		trace(3, "Accepted new request on socket #{@socket_name}")
-		channel.io = connection
-		if headers = parse_request(connection, channel, buffer)
+		if !headers
+			# New socket accepted, instead of keeping-alive an old one
+			channel.io = connection
+			headers = parse_request(connection, channel, buffer)
+		end
+		if headers
 			prepare_request(connection, headers)
 			begin
-				if headers[REQUEST_METHOD] == PING
+				if headers[REQUEST_METHOD] == GET
+					process_request(headers, connection, socket_wrapper, @protocol == :http)
+				elsif headers[REQUEST_METHOD] == PING
 					process_ping(headers, connection)
 				elsif headers[REQUEST_METHOD] == OOBW
 					process_oobw(headers, connection)
@@ -172,10 +187,11 @@ private
 			raise e if should_reraise_error?(e)
 		end
 	ensure
-		# The 'close_write' here prevents forked child
-		# processes from unintentionally keeping the
-		# connection open.
-		if connection && !connection.closed?
+		# Close connection if keep-alive not possible
+		if connection && !connection.closed? && !@last_connection
+			# The 'close_write' here prevents forked child
+			# processes from unintentionally keeping the
+			# connection open.
 			begin
 				connection.close_write
 			rescue SystemCallError, IOError
@@ -276,6 +292,17 @@ private
 #	end
 
 	def prepare_request(connection, headers)
+		transfer_encoding = headers[TRANSFER_ENCODING]
+		content_length = headers[CONTENT_LENGTH]
+		@can_keepalive = @keepalive_enabled &&
+			!transfer_encoding &&
+			!content_length
+		@keepalive_performed = false
+
+		if !transfer_encoding && !content_length
+			connection.simulate_eof!
+		end
+
 		if @union_station_core && headers[PASSENGER_TXN_ID]
 			txn_id = headers[PASSENGER_TXN_ID]
 			union_station_key = headers[PASSENGER_UNION_STATION_KEY]
@@ -312,6 +339,10 @@ private
 		Thread.current[UNION_STATION_CORE] = nil
 		Thread.current[UNION_STATION_REQUEST_TRANSACTION] = nil
 
+		if connection
+			connection.stop_simulating_eof!
+		end
+
 		if transaction && !transaction.closed?
 			exception_occurred = false
 			begin
@@ -355,6 +386,11 @@ private
 			end
 		end
 
+		if !has_error && @keepalive_performed && connection
+			trace(3, "Keep-aliving connection.")
+			@last_connection = connection
+		end
+
 		#################
 	end
 

data/lib/phusion_passenger/ruby_core_enhancements.rb

@@ -1,6 +1,6 @@
 # encoding: binary
 #  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.
 #
@@ -37,7 +37,6 @@ if (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby") && RUBY_VERSION < "1.8.7"
 			"gem install fastthread"
 	end
 end
-PhusionPassenger.require_passenger_lib 'native_support'
 
 class Exception
 	def backtrace_string(current_location = nil)
@@ -60,85 +59,33 @@ class Exception
 	end
 end
 
-class IO
-	if defined?(PhusionPassenger::NativeSupport)
-		# Writes all of the strings in the +components+ array into the given file
-		# descriptor using the +writev()+ system call. Unlike IO#write, this method
-		# does not require one to concatenate all those strings into a single buffer
-		# in order to send the data in a single system call. Thus, #writev is a great
-		# way to perform zero-copy I/O.
-		#
-		# Unlike the raw writev() system call, this method ensures that all given
-		# data is written before returning, by performing multiple writev() calls
-		# and whatever else is necessary.
-		#
-		#   io.writev(["hello ", "world", "\n"])
-		def writev(components)
-			return PhusionPassenger::NativeSupport.writev(fileno, components)
+class Dir
+	# Dir.pwd resolves symlinks. This version tries not to, by shelling
+	# out to the pwd tool.
+	def self.pwd_no_resolve
+		begin
+			result = `pwd`.strip
+		rescue Errno::ENOENT
+			result = `/bin/pwd`.strip
 		end
-
-		# Like #writev, but accepts two arrays. The data is written in the given order.
-		#
-		#   io.writev2(["hello ", "world", "\n"], ["another ", "message\n"])
-		def writev2(components, components2)
-			return PhusionPassenger::NativeSupport.writev2(fileno,
-				components, components2)
-		end
-
-		# Like #writev, but accepts three arrays. The data is written in the given order.
-		#
-		#   io.writev3(["hello ", "world", "\n"],
-		#     ["another ", "message\n"],
-		#     ["yet ", "another ", "one", "\n"])
-		def writev3(components, components2, components3)
-			return PhusionPassenger::NativeSupport.writev3(fileno,
-				components, components2, components3)
-		end
-	else
-		def writev(components)
-			return write(components.join(''))
-		end
-
-		def writev2(components, components2)
-			data = ''
-			components.each do |component|
-				data << component
-			end
-			components2.each do |component|
-				data << component
-			end
-			return write(data)
-		end
-
-		def writev3(components, components2, components3)
-			data = ''
-			components.each do |component|
-				data << component
-			end
-			components2.each do |component|
-				data << component
-			end
-			components3.each do |component|
-				data << component
-			end
-			return write(data)
+		if result.empty?
+			return Dir.pwd
+		else
+			return result
 		end
 	end
+end
 
-	if IO.method_defined?(:close_on_exec=)
-		def close_on_exec!
-			self.close_on_exec = true
+class File
+	# Dir.pwd resolves symlinks. So in turn, File.expand_path/File.absolute_path
+	# do that too. This method fixes that by using Dir.pwd_no_resolve.
+	if File.respond_to?(:absolute_path)
+		def self.absolute_path_no_resolve(path)
+			return File.absolute_path(path, Dir.pwd_no_resolve)
 		end
 	else
-		require 'fcntl'
-
-		if defined?(Fcntl::F_SETFD)
-			def close_on_exec!
-				fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
-			end
-		else
-			def close_on_exec!
-			end
+		def self.absolute_path_no_resolve(path)
+			return File.expand_path(path, Dir.pwd_no_resolve)
 		end
 	end
 end
@@ -149,16 +96,17 @@ module Signal
 		ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
 		case ruby_engine
 		when "jruby"
-			result = Signal.list.dup
+			result = Signal.list
 			result.delete("QUIT")
 			result.delete("ILL")
 			result.delete("FPE")
+			result.delete("KILL")
 			result.delete("SEGV")
 			result.delete("USR1")
 			result.delete("IOT")
 			result.delete("EXIT")
 		else
-			result = Signal.list.dup
+			result = Signal.list
 			result.delete("ALRM")
 			result.delete("VTALRM")
 		end