passenger 3.0.21 → 3.9.1.beta

data/lib/phusion_passenger/platform_info/ruby.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Phusion Passenger - http://www.modrails.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
@@ -48,54 +48,29 @@ module PlatformInfo
 	def self.ruby_command
 		if in_rvm?
 			name = rvm_ruby_string
-			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
+			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
-					if filename
-						return filename
+					# 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
-
-				# 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"
+				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
 				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
@@ -130,7 +105,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')
@@ -181,39 +156,29 @@ module PlatformInfo
 		return bindir.include?('/.rvm/') || bindir.include?('/rvm/')
 	end
 	
-	# 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 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 in_rvm?
-			result = []
 			[ENV['rvm_path'], "~/.rvm", "/usr/local/rvm"].each do |path|
 				next if path.nil?
 				path = File.expand_path(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
+				script_path = File.join(path, 'scripts', 'rvm')
+				return path if File.directory?(path) && File.exist?(script_path)
 			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_paths
+	memoize :rvm_path
 	
 	# If the current Ruby interpreter is managed by RVM, returns the
 	# RVM name which identifies the current Ruby interpreter plus the
@@ -235,12 +200,8 @@ module PlatformInfo
 			# try various strategies...
 			
 			# $GEM_HOME usually contains the gem set name.
-			# 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(/\/.*/, '')
+			if GEM_HOME && GEM_HOME.include?("rvm/gems/")
+				return File.basename(GEM_HOME)
 			end
 			
 			# User somehow managed to nuke $GEM_HOME. Extract info
@@ -266,27 +227,6 @@ 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

@@ -0,0 +1,121 @@
+# encoding: binary
+#  Phusion Passenger - http://www.modrails.com/
+#  Copyright (c) 2011, 2012 Phusion
+#
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
+require 'socket'
+require 'phusion_passenger/native_support'
+
+module PhusionPassenger
+
+# Provides shared functions for preloader apps.
+module PreloaderSharedHelpers
+	extend self
+	
+	def accept_and_process_next_client(server_socket)
+		original_pid = Process.pid
+		client = server_socket.accept
+		client.binmode
+		begin
+			command = client.readline
+		rescue EOFError
+			return nil
+		end
+		if command !~ /\n\Z/
+			STDERR.puts "Command must end with a newline"
+		elsif command == "spawn\n"
+			while client.readline != "\n"
+				# Do nothing.
+			end
+			
+			# Improve copy-on-write friendliness.
+			GC.start
+			
+			pid = fork
+			if pid.nil?
+				$0 = "#{$0} (forking...)"
+				client.puts "OK"
+				client.puts Process.pid
+				client.flush
+				client.sync = true
+				return [:forked, client]
+			else
+				NativeSupport.detach_process(pid)
+			end
+		else
+			STDERR.puts "Unknown command '#{command.inspect}'"
+		end
+		return nil
+	ensure
+		client.close if client && Process.pid == original_pid
+	end
+	
+	def run_main_loop(options)
+		$0 = "Passenger AppPreloader: #{options['app_root']}"
+		client = nil
+		original_pid = Process.pid
+		socket_filename = "#{options['generation_dir']}/backends/preloader.#{Process.pid}"
+		server = UNIXServer.new(socket_filename)
+		server.close_on_exec!
+		
+		# Update the dump information just before telling the preloader that we're
+		# ready because the HelperAgent will read and memorize this information.
+		LoaderSharedHelpers.dump_all_information
+
+		puts "!> Ready"
+		puts "!> socket: unix:#{socket_filename}"
+		puts "!> "
+		
+		while true
+			ios = select([server, STDIN])[0]
+			if ios.include?(server)
+				result, client = accept_and_process_next_client(server)
+				if result == :forked
+					STDIN.reopen(client)
+					STDOUT.reopen(client)
+					STDOUT.sync = true
+					client.close
+					return :forked
+				end
+			end
+			if ios.include?(STDIN)
+				if STDIN.tty?
+					begin
+						# Prevent bash from exiting when we press Ctrl-D.
+						STDIN.read_nonblock(1)
+					rescue Errno::EAGAIN
+						# Do nothing.
+					end
+				end
+				break
+			end
+		end
+		return nil
+	ensure
+		server.close if server
+		if original_pid == Process.pid
+			File.unlink(socket_filename) rescue nil
+		end
+	end
+end
+
+end # module PhusionPassenger

data/lib/phusion_passenger/public_api.rb

@@ -23,9 +23,6 @@
 
 module PhusionPassenger
 class << self
-	# Set during spawning, and set back to nil when spawning is done.
-	attr_accessor :_spawn_options
-	
 	@@event_starting_worker_process = []
 	@@event_stopping_worker_process = []
 	@@event_credentials = []
@@ -45,7 +42,7 @@ class << self
 		require 'rails/version' if defined?(::Rails) && !defined?(::Rails::VERSION)
 		if defined?(::Rails) && ::Rails::VERSION::MAJOR == 3
 			require 'phusion_passenger/rails3_extensions/init'
-			Rails3Extensions.init!(_spawn_options, *args)
+			Rails3Extensions.init!(PhusionPassenger::App.options, *args)
 		end
 	end
 	

data/lib/phusion_passenger/rack/{request_handler.rb → thread_handler_extension.rb}

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2012 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -22,14 +22,12 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'phusion_passenger/abstract_request_handler'
-require 'phusion_passenger/utils/rewindable_input'
+require 'phusion_passenger/utils/tee_input'
 
 module PhusionPassenger
 module Rack
 
-# A request handler for Rack applications.
-class RequestHandler < AbstractRequestHandler
+module ThreadHandlerExtension
 	# Constants which exist to relieve Ruby's garbage collector.
 	RACK_VERSION       = "rack.version"        # :nodoc:
 	RACK_VERSION_VALUE = [1, 0]                # :nodoc:
@@ -40,10 +38,6 @@ class RequestHandler < AbstractRequestHandler
 	RACK_RUN_ONCE      = "rack.run_once"       # :nodoc:
 	RACK_URL_SCHEME	   = "rack.url_scheme"     # :nodoc:
 	SCRIPT_NAME        = "SCRIPT_NAME"         # :nodoc:
-	CONTENT_LENGTH      = "CONTENT_LENGTH"       # :nodoc:
-	CONTENT_TYPE        = "CONTENT_TYPE"         # :nodoc:
-	HTTP_CONTENT_LENGTH = "HTTP_CONTENT_LENGTH"  # :nodoc:
-	HTTP_CONTENT_TYPE = "HTTP_CONTENT_TYPE"      # :nodoc:
 	HTTPS          = "HTTPS"  # :nodoc:
 	HTTPS_DOWNCASE = "https"  # :nodoc:
 	HTTP           = "http"   # :nodoc:
@@ -53,69 +47,31 @@ class RequestHandler < AbstractRequestHandler
 	CRLF           = "\r\n"   # :nodoc:
 	NEWLINE        = "\n"     # :nodoc:
 	STATUS         = "Status: "       # :nodoc:
-	X_POWERED_BY   = "X-Powered-By: "   # :nodoc:
 	NAME_VALUE_SEPARATOR = ": "       # :nodoc:
 
-	# +app+ is the Rack application object.
-	def initialize(owner_pipe, app, options = {})
-		super(owner_pipe, options)
-		@app = app
-	end
-
-protected
-	# Overrided method.
-	def process_request(env, input, output, full_http_response)
-		rewindable_input = PhusionPassenger::Utils::RewindableInput.new(input)
+	def process_request(env, connection, full_http_response)
+		rewindable_input = PhusionPassenger::Utils::TeeInput.new(connection, env)
 		begin
 			env[RACK_VERSION]      = RACK_VERSION_VALUE
 			env[RACK_INPUT]        = rewindable_input
 			env[RACK_ERRORS]       = STDERR
-			env[RACK_MULTITHREAD]  = false
+			env[RACK_MULTITHREAD]  = @request_handler.concurrency > 1
 			env[RACK_MULTIPROCESS] = true
 			env[RACK_RUN_ONCE]     = false
-			
-			if env[HTTP_CONTENT_LENGTH] && env[CONTENT_LENGTH]
-				env.delete(HTTP_CONTENT_LENGTH)
-			elsif env[HTTP_CONTENT_LENGTH] && !env[CONTENT_LENGTH]
-				env[CONTENT_LENGTH] = env[HTTP_CONTENT_LENGTH]
-				env.delete(HTTP_CONTENT_LENGTH)
-			end
-			if env[HTTP_CONTENT_TYPE] && env[CONTENT_TYPE]
-				env.delete(HTTP_CONTENT_TYPE)
-			elsif env[HTTP_CONTENT_TYPE] && !env[CONTENT_TYPE]
-				env[CONTENT_TYPE] = env[HTTP_CONTENT_TYPE]
-				env.delete(HTTP_CONTENT_TYPE)
-			end
-			
 			if env[HTTPS] == YES || env[HTTPS] == ON || env[HTTPS] == ONE
 				env[RACK_URL_SCHEME] = HTTPS_DOWNCASE
 			else
 				env[RACK_URL_SCHEME] = HTTP
 			end
 			
-			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
+			status, headers, body = @app.call(env)
 			begin
 				if full_http_response
-					output.write("HTTP/1.1 #{status.to_i.to_s} Whatever#{CRLF}")
-					output.write("Connection: close#{CRLF}")
+					connection.write("HTTP/1.1 #{status.to_i.to_s} Whatever#{CRLF}")
+					connection.write("Connection: close#{CRLF}")
 				end
 				headers_output = [
-					STATUS, status.to_i.to_s, CRLF,
-					X_POWERED_BY, @passenger_header, CRLF
+					STATUS, status.to_i.to_s, CRLF
 				]
 				headers.each do |key, values|
 					if values.is_a?(String)
@@ -134,15 +90,15 @@ protected
 					# The body may be an ActionController::StringCoercion::UglyBody
 					# object instead of a real Array, even when #is_a? claims so.
 					# Call #to_a just to be sure.
-					output.writev2(headers_output, body.to_a)
+					connection.writev2(headers_output, body.to_a)
 				elsif body.is_a?(String)
 					headers_output << body
-					output.writev(headers_output)
+					connection.writev(headers_output)
 				else
-					output.writev(headers_output)
+					connection.writev(headers_output)
 					if body
 						body.each do |s|
-							output.write(s)
+							connection.write(s)
 						end
 					end
 				end
@@ -153,11 +109,6 @@ 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