passenger 4.0.49 → 4.0.50

data/lib/phusion_passenger/request_handler.rb

@@ -112,7 +112,7 @@ class RequestHandler
 		@server_sockets = {}
 		
 		if should_use_unix_sockets?
-			@main_socket_address, @main_socket = create_unix_socket_on_filesystem
+			@main_socket_address, @main_socket = create_unix_socket_on_filesystem(options)
 		else
 			@main_socket_address, @main_socket = create_tcp_socket
 		end
@@ -159,11 +159,14 @@ class RequestHandler
 			end
 			@main_loop_thread.join
 		end
-		@server_sockets.each_value do |value|
-			address, type, socket = value
-			socket.close rescue nil
-			if type == 'unix'
-				File.unlink(address) rescue nil
+		@server_sockets.each_value do |info|
+			socket = info[:socket]
+			type = get_socket_address_type(info[:address])
+
+			socket.close if !socket.closed?
+			if type == :unix
+				filename = info[:address].sub(/^unix:/, '')
+				File.unlink(filename) rescue nil
 			end
 		end
 		@owner_pipe.close rescue nil
@@ -316,24 +319,28 @@ private
 		return !@force_http_session && ruby_engine != "jruby"
 	end
 
-	def create_unix_socket_on_filesystem
-		while true
-			begin
-				if defined?(NativeSupport)
-					unix_path_max = NativeSupport::UNIX_PATH_MAX
-				else
-					unix_path_max = 100
-				end
-				socket_address = "#{passenger_tmpdir}/backends/ruby.#{generate_random_id(:base64)}"
-				socket_address = socket_address.slice(0, unix_path_max - 10)
-				socket = UNIXServer.new(socket_address)
-				socket.listen(BACKLOG_SIZE)
-				socket.close_on_exec!
-				File.chmod(0600, socket_address)
-				return ["unix:#{socket_address}", socket]
-			rescue Errno::EADDRINUSE
-				# Do nothing, try again with another name.
-			end
+	def create_unix_socket_on_filesystem(options)
+		if defined?(NativeSupport)
+			unix_path_max = NativeSupport::UNIX_PATH_MAX
+		else
+			unix_path_max = options.fetch('UNIX_PATH_MAX', 100)
+		end
+		if options['generation_dir']
+			socket_dir = "#{options['generation_dir']}/backends"
+			socket_prefix = "ruby"
+		else
+			socket_dir = Dir.tmpdir
+			socket_prefix = "PsgRubyApp"
+		end
+
+		retry_at_most(128, Errno::EADDRINUSE) do
+			socket_address = "#{socket_dir}/#{socket_prefix}.#{generate_random_id(:base64)}"
+			socket_address = socket_address.slice(0, unix_path_max - 10)
+			socket = UNIXServer.new(socket_address)
+			socket.listen(BACKLOG_SIZE)
+			socket.close_on_exec!
+			File.chmod(0600, socket_address)
+			["unix:#{socket_address}", socket]
 		end
 	end
 	

data/lib/phusion_passenger/utils.rb

@@ -27,7 +27,7 @@ module PhusionPassenger
 # Utility functions.
 module Utils
 	extend self    # Make methods available as class methods.
-	
+
 	def self.included(klass)
 		# When included into another class, make sure that Utils
 		# methods are made private.
@@ -35,7 +35,7 @@ module Utils
 			klass.send(:private, method_name)
 		end
 	end
-	
+
 	# Generate a long, cryptographically secure random ID string, which
 	# is also a valid filename.
 	def generate_random_id(method)
@@ -56,7 +56,19 @@ module Utils
 			raise ArgumentError, "Invalid method #{method.inspect}"
 		end
 	end
-	
+
+	def retry_at_most(n, *exceptions)
+		n.times do |i|
+			begin
+				return yield
+			rescue *exceptions
+				if i == n - 1
+					raise
+				end
+			end
+		end
+	end
+
 	def home_dir
 		Etc.getpwuid(Process.uid).dir
 	end
@@ -77,7 +89,7 @@ module Utils
 			end
 		end
 	end
-	
+
 	def get_socket_address_type(address)
 		if address =~ %r{^unix:.}
 			return :unix
@@ -87,7 +99,7 @@ module Utils
 			return :unknown
 		end
 	end
-	
+
 	def connect_to_server(address)
 		case get_socket_address_type(address)
 		when :unix
@@ -100,7 +112,7 @@ module Utils
 			raise ArgumentError, "Unknown socket address type for '#{address}'."
 		end
 	end
-	
+
 	def local_socket_address?(address)
 		case get_socket_address_type(address)
 		when :unix
@@ -112,7 +124,7 @@ module Utils
 			raise ArgumentError, "Unknown socket address type for '#{address}'."
 		end
 	end
-	
+
 	# Checks whether the given process exists.
 	def process_is_alive?(pid)
 		begin
@@ -138,7 +150,7 @@ module Utils
 			object.instance_variable_set("@#{key}", options[key])
 		end
 	end
-	
+
 	# Returns a string which reports the backtraces for all threads,
 	# or if that's not supported the backtrace for the current thread.
 	def global_backtrace_report
@@ -178,7 +190,7 @@ module Utils
 		end
 		return output
 	end
-	
+
 	####################################
 end
 

data/test/ruby/rails4.1/loader_spec.rb

@@ -0,0 +1,28 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'ruby/shared/loader_sharedspec'
+require 'ruby/shared/rails/union_station_extensions_sharedspec'
+
+if RUBY_VERSION_INT >= 190
+module PhusionPassenger
+
+describe "Rack loader with Rails 4.1" do
+	include LoaderSpecHelper
+
+	before :each do
+		@stub = register_stub(RackStub.new("rails4.1"))
+	end
+
+	def start(options = {})
+		@loader = Loader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-loader.rb"], @stub.app_root)
+		return @loader.start(options)
+	end
+
+	def rails_version
+		return "4.1"
+	end
+
+	include_examples "Union Station extensions for Rails"
+end
+
+end # module PhusionPassenger
+end

data/test/ruby/rails4.1/preloader_spec.rb

@@ -0,0 +1,34 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'ruby/shared/loader_sharedspec'
+require 'ruby/shared/rails/union_station_extensions_sharedspec'
+
+if RUBY_VERSION_INT >= 190
+module PhusionPassenger
+
+describe "Rack loader with Rails 4.1" do
+	include LoaderSpecHelper
+
+	before :each do
+		@stub = register_stub(RackStub.new("rails4.1"))
+	end
+
+	def start(options = {})
+		@preloader = Preloader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-preloader.rb"], @stub.app_root)
+		result = @preloader.start(options)
+		if result[:status] == "Ready"
+			@loader = @preloader.spawn(options)
+			return @loader.start(options)
+		else
+			return result
+		end
+	end
+
+	def rails_version
+		return "4.1"
+	end
+
+	include_examples "Union Station extensions for Rails"
+end
+
+end # module PhusionPassenger
+end

data/test/ruby/request_handler_spec.rb

@@ -20,16 +20,18 @@ describe RequestHandler do
 		preinitialize if respond_to?(:preinitialize)
 		@old_passenger_tmpdir = Utils.passenger_tmpdir
 		Utils.passenger_tmpdir = "request_handler_spec.tmp"
+		Utils.passenger_tmpdir
 		@owner_pipe = IO.pipe
 		@options ||= {}
 		@thread_handler = Class.new(DummyThreadHandler)
 		@options = {
 			"app_group_name" => "foobar",
-			"thread_handler" => @thread_handler
+			"thread_handler" => @thread_handler,
+			"generation_dir" => "request_handler_spec.tmp"
 		}.merge(@options)
 		@request_handler = RequestHandler.new(@owner_pipe[1], @options)
 	end
-	
+
 	after :each do
 		stop_request_handler
 		Utils.passenger_tmpdir = @old_passenger_tmpdir
@@ -44,12 +46,12 @@ describe RequestHandler do
 			@request_handler = nil
 		end
 	end
-	
+
 	def connect(socket_name = :main)
 		address = @request_handler.server_sockets[socket_name][:address]
 		return Utils.connect_to_server(address)
 	end
-	
+
 	def send_binary_request(socket, env)
 		channel = MessageChannel.new(socket)
 		data = ""
@@ -59,7 +61,7 @@ describe RequestHandler do
 		end
 		channel.write_scalar(data)
 	end
-	
+
 	it "exits if the owner pipe is closed" do
 		@request_handler.start_main_loop_thread
 		@owner_pipe[0].close
@@ -74,7 +76,7 @@ describe RequestHandler do
 			Dir["request_handler_spec.tmp/backends/*"].should_not be_empty
 		end
 	end
-	
+
 	specify "the main socket rejects headers that are too large" do
 		stderr = StringIO.new
 		DebugLogging.log_level = 0
@@ -95,7 +97,7 @@ describe RequestHandler do
 			client.close rescue nil
 		end
 	end
-	
+
 	specify "the main socket rejects unauthenticated connections, if a connect password is supplied" do
 		@request_handler.connect_password = "1234"
 		@request_handler.start_main_loop_thread
@@ -116,7 +118,7 @@ describe RequestHandler do
 			client.close rescue nil
 		end
 	end
-	
+
 	it "accepts pings on the main server socket" do
 		@request_handler.start_main_loop_thread
 		client = connect
@@ -128,7 +130,7 @@ describe RequestHandler do
 			client.close
 		end
 	end
-	
+
 	it "accepts pings on the HTTP server socket" do
 		@request_handler.start_main_loop_thread
 		client = connect(:http)
@@ -141,7 +143,7 @@ describe RequestHandler do
 			client.close
 		end
 	end
-	
+
 	specify "the HTTP socket rejects headers that are too large" do
 		stderr = StringIO.new
 		DebugLogging.log_level = 0
@@ -163,7 +165,7 @@ describe RequestHandler do
 			client.close rescue nil
 		end
 	end
-	
+
 	specify "the HTTP socket rejects unauthenticated connections, if a connect password is supplied" do
 		DebugLogging.log_level = -1
 		@request_handler.connect_password = "1234"
@@ -522,23 +524,23 @@ describe RequestHandler do
 			@logging_agent_password = "1234"
 			@agent_pid, @socket_filename, @socket_address = spawn_logging_agent(@dump_file,
 				@logging_agent_password)
-			
+
 			@union_station_core = UnionStation::Core.new(@socket_address, "logging",
 				"1234", "localhost")
 			@options = { "union_station_core" => @union_station_core }
 		end
-		
+
 		after :each do
 			if @agent_pid
 				Process.kill('KILL', @agent_pid)
 				Process.waitpid(@agent_pid)
 			end
 		end
-		
+
 		def base64(data)
 			return [data].pack('m').gsub("\n", "")
 		end
-		
+
 		it "makes the analytics log object available through the request env and a thread-local variable" do
 			header_value = nil
 			thread_value = nil
@@ -561,7 +563,7 @@ describe RequestHandler do
 			thread_value.should be_kind_of(UnionStation::Transaction)
 			header_value.should == thread_value
 		end
-		
+
 		it "logs uncaught exceptions for requests that have a transaction ID" do
 			reraised = false
 			@thread_handler.any_instance.should_receive(:process_request).and_return do |headers, connection, full_http_response|
@@ -596,18 +598,18 @@ describe RequestHandler do
 			reraised.should be_true
 		end
 	end
-	
+
 	describe "HTTP parsing" do
 		before :each do
 			@request_handler.start_main_loop_thread
 			@client = connect(:http)
 			@client.sync = true
 		end
-		
+
 		after :each do
 			@client.close if @client
 		end
-		
+
 		it "correctly parses HTTP requests without query string" do
 			@thread_handler.any_instance.should_receive(:process_request).and_return do |headers, connection, full_http_response|
 				headers["REQUEST_METHOD"].should == "POST"
@@ -623,7 +625,7 @@ describe RequestHandler do
 				headers["CONTENT_LENGTH"].should == "10"
 				headers["CONTENT_TYPE"].should == "text/plain"
 			end
-			
+
 			@client.write("POST /foo/bar HTTP/1.1\r\n")
 			@client.write("Host: foo.com\r\n")
 			@client.write("X-Foo-Bar: baz\r\n")
@@ -633,7 +635,7 @@ describe RequestHandler do
 			@client.close_write
 			@client.read
 		end
-		
+
 		it "correctly parses HTTP requests with query string" do
 			@thread_handler.any_instance.should_receive(:process_request).and_return do |headers, connection, full_http_response|
 				headers["REQUEST_METHOD"].should == "POST"
@@ -649,7 +651,7 @@ describe RequestHandler do
 				headers["CONTENT_LENGTH"].should == "10"
 				headers["CONTENT_TYPE"].should == "text/plain"
 			end
-			
+
 			@client.write("POST /foo/bar?hello=world&a=b+c HTTP/1.1\r\n")
 			@client.write("Host: foo.com\r\n")
 			@client.write("X-Foo-Bar: baz\r\n")
@@ -659,7 +661,7 @@ describe RequestHandler do
 			@client.close_write
 			@client.read
 		end
-		
+
 		it "correct parses HTTP requests that come in arbitrary chunks" do
 			@thread_handler.any_instance.should_receive(:process_request).and_return do |headers, connection, full_http_response|
 				headers["REQUEST_METHOD"].should == "POST"
@@ -676,7 +678,7 @@ describe RequestHandler do
 				headers["CONTENT_TYPE"].should == "text/plain"
 				headers["HTTP_PLUS_SOME"].should be_nil
 			end
-			
+
 			@client.write("POST /fo")
 			sleep 0.001
 			@client.write("o/bar?hello=world&a=b+c HT")
@@ -700,7 +702,7 @@ describe RequestHandler do
 			@client.read
 		end
 	end
-	
+
 	############################
 end
 

data/test/stub/rails4.1/.gitignore

@@ -0,0 +1,16 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp