passenger 4.0.60 → 5.0.0.beta1

data/test/ruby/utils/tee_input_spec.rb

@@ -32,7 +32,7 @@ shared_examples "TeeInput#gets" do
 
 	context "if Transfer-Encoding is chunked" do
 		before :each do
-			init_input("hello\nworld\nlast line", "HTTP_TRANSFER_ENCODING" => "chunked")
+			init_input("hello\nworld\nlast line", "TRANSFER_ENCODING" => "chunked")
 		end
 
 		it "reads a line, including newline character" do
@@ -84,7 +84,7 @@ shared_examples "TeeInput#read" do
 
 		context "if Transfer-Encoding is chunked" do
 			before :each do
-				init_input("hello!", "HTTP_TRANSFER_ENCODING" => "chunked")
+				init_input("hello!", "TRANSFER_ENCODING" => "chunked")
 			end
 
 			it "slurps the entire socket" do
@@ -115,7 +115,7 @@ shared_examples "TeeInput#read" do
 		end
 
 		it "returns the empty string if len == 0" do
-			init_input("hello", "HTTP_TRANSFER_ENCODING" => "chunked")
+			init_input("hello", "TRANSFER_ENCODING" => "chunked")
 			@input.read(0).should == ""
 		end
 
@@ -142,7 +142,7 @@ shared_examples "TeeInput#read" do
 
 		context "if Transfer-Encoding is chunked" do
 			before :each do
-				init_input("hello", "HTTP_TRANSFER_ENCODING" => "chunked")
+				init_input("hello", "TRANSFER_ENCODING" => "chunked")
 			end
 
 			it "reads exactly len bytes if available" do
@@ -180,7 +180,7 @@ shared_examples "TeeInput#size" do
 
 	context "if Transfer-Encoding is chunked" do
 		it "returns the number of bytes that can be read from the socket until EOF" do
-			init_input("hello world", "HTTP_TRANSFER_ENCODING" => "chunked")
+			init_input("hello world", "TRANSFER_ENCODING" => "chunked")
 			@input.size.should == 11
 		end
 	end

data/test/ruby/utils_spec.rb

@@ -14,7 +14,7 @@ module PhusionPassenger
 describe Utils do
 	include Utils
 	include Utils::NativeSupportUtils
-	
+
 	specify "#to_boolean works" do
 		LoaderSharedHelpers.to_boolean(nil).should be_false
 		LoaderSharedHelpers.to_boolean(false).should be_false
@@ -26,7 +26,7 @@ describe Utils do
 		LoaderSharedHelpers.to_boolean("false").should be_false
 		LoaderSharedHelpers.to_boolean("bla bla").should be_true
 	end
-	
+
 	specify "#split_by_null_into_hash works" do
 		split_by_null_into_hash("").should == {}
 		split_by_null_into_hash("foo\0bar\0").should == { "foo" => "bar" }
@@ -34,43 +34,7 @@ describe Utils do
 		split_by_null_into_hash("foo\0bar\0baz\0\0").should == { "foo" => "bar", "baz" => "" }
 		split_by_null_into_hash("\0\0").should == { "" => "" }
 	end
-	
-	describe "#passenger_tmpdir" do
-		before :each do
-			@old_passenger_tmpdir = Utils.passenger_tmpdir
-			Utils.passenger_tmpdir = nil
-		end
-		
-		after :each do
-			Utils.passenger_tmpdir = @old_passenger_tmpdir
-		end
-		
-		it "returns a directory under /tmp if Utils.passenger_tmpdir is nil" do
-			File.dirname(passenger_tmpdir(false)).should == "/tmp"
-		end
-		
-		it "returns a directory under /tmp if Utils.passenger_tmpdir is an empty string" do
-			Utils.passenger_tmpdir = ''
-			File.dirname(passenger_tmpdir(false)).should == "/tmp"
-		end
-		
-		it "returns Utils.passenger_tmpdir if it's set" do
-			Utils.passenger_tmpdir = '/foo'
-			passenger_tmpdir(false).should == '/foo'
-		end
-		
-		it "creates the directory if it doesn't exist, if the 'create' argument is true" do
-			Utils.passenger_tmpdir = 'utils_spec.tmp'
-			passenger_tmpdir
-			begin
-				File.directory?('utils_spec.tmp').should be_true
-			ensure
-				FileUtils.chmod_R(0777, 'utils_spec.tmp')
-				FileUtils.rm_rf('utils_spec.tmp')
-			end
-		end
-	end
-	
+
 	######################
 end
 

data/test/stub/apache2/httpd.conf.erb

@@ -61,10 +61,12 @@ PassengerRoot "<%= @passenger_root %>"
 PassengerDefaultRuby "<%= PlatformInfo.ruby_command %>"
 PassengerDefaultUser <%= CONFIG['default_user'] %>
 PassengerDefaultGroup <%= CONFIG['default_group'] %>
-PassengerTempDir "<%= @passenger_temp_dir %>"
+PassengerInstanceRegistryDir "<%= @passenger_temp_dir %>"
+PassengerDataBufferDir "<%= @passenger_temp_dir %>"
 RailsEnv production
 RackEnv production
-PassengerLogLevel 1
+PassengerLogLevel 7
+PassengerTurbocaching off
 <% for line in @extra %>
 	<%= line %>
 <% end %>
@@ -93,6 +95,7 @@ MaxClients           10
 	AllowOverride all
 </Directory>
 
+Timeout 60
 ServerAdmin admin@passenger.test
 ServerName passenger.test
 DocumentRoot "<%= @server_root %>"

data/test/stub/nginx/nginx.conf.erb

@@ -31,7 +31,9 @@ http {
     passenger_default_user <%= CONFIG['default_user'] %>;
     passenger_default_group <%= CONFIG['default_group'] %>;
     passenger_max_pool_size <%= @max_pool_size %>;
-    passenger_log_level 3;
+    passenger_log_level 7;
+    passenger_turbocaching off;
+    <% if @stat_throttle_rate %>passenger_stat_throttle_rate <%= @stat_throttle_rate %>;<% end %>
 
     <% for server in @servers %>
         server {

data/test/support/apache2_controller.rb

@@ -27,13 +27,13 @@ PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 # Apache configuration option. Then you can write the following test:
 #
 #   apache = Apache2Controller.new
-#   
+#
 #   # Add a configuration option to the configuration file.
 #   apache << "AlwaysPrintHelloWorld on"
-#   
+#
 #   # Write configuration file and start Apache with that configuration file.
 #   apache.start
-#   
+#
 #   begin
 #       response_body = http_get("http://localhost:#{apache.port}/some/url")
 #       response_body.should == "hello world!"
@@ -43,43 +43,43 @@ PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 class Apache2Controller
 	include PhusionPassenger
 	STUB_DIR = File.expand_path(File.dirname(__FILE__) + "/../stub/apache2")
-	
+
 	class VHost
 		attr_accessor :domain
 		attr_accessor :document_root
 		attr_accessor :additional_configs
-		
+
 		def initialize(domain, document_root)
 			@domain = domain
 			@document_root = document_root
 			@additional_configs = []
 		end
-		
+
 		def <<(config)
 			@additional_configs << config
 		end
 	end
-	
+
 	attr_accessor :port
 	attr_accessor :vhosts
 	attr_reader :server_root
-	
+
 	def initialize(options = nil)
 		set(options) if options
 		@port = 64506
 		@vhosts = []
 		@extra = []
 		@server_root = File.expand_path('tmp.apache2')
-		@passenger_root = File.expand_path(PhusionPassenger.source_root)
+		@passenger_root = File.expand_path(PhusionPassenger.install_spec)
 		@mod_passenger = PhusionPassenger.apache2_module_path
 	end
-	
+
 	def set(options)
 		options.each_pair do |key, value|
 			instance_variable_set("@#{key}", value)
 		end
 	end
-	
+
 	# Create an Apache configuration folder and start Apache on that
 	# configuration folder. This method does not return until Apache
 	# has done initializing.
@@ -91,18 +91,18 @@ class Apache2Controller
 		else
 			File.unlink("#{@server_root}/httpd.pid") rescue nil
 		end
-		
+
 		if File.exist?(@server_root)
 			FileUtils.rm_r(@server_root)
 		end
 		FileUtils.mkdir_p(@server_root)
 		write_config_file
 		FileUtils.cp("#{STUB_DIR}/mime.types", @server_root)
-		
+
 		if !system(PlatformInfo.httpd, "-f", "#{@server_root}/httpd.conf", "-k", "start")
 			raise "Could not start an Apache server."
 		end
-		
+
 		begin
 			# Wait until the PID file has been created.
 			Timeout::timeout(20) do
@@ -132,14 +132,14 @@ class Apache2Controller
 			end
 		end
 	end
-	
+
 	def graceful_restart
 		write_config_file
 		if !system(PlatformInfo.httpd, "-f", "#{@server_root}/httpd.conf", "-k", "graceful")
 			raise "Cannot restart Apache."
 		end
 	end
-	
+
 	# Stop Apache and delete its configuration folder. This method waits
 	# until Apache is done with its shutdown procedure.
 	#
@@ -184,7 +184,7 @@ class Apache2Controller
 			FileUtils.rm_r(@server_root)
 		end
 	end
-	
+
 	# Define a virtual host configuration block for the Apache configuration
 	# file. If there was already a vhost definition with the same domain name,
 	# then it will be overwritten.
@@ -199,7 +199,7 @@ class Apache2Controller
 		vhosts.reject! {|host| host.domain == domain}
 		vhosts << vhost
 	end
-	
+
 	# Checks whether this Apache instance is running.
 	def running?
 		if File.exist?("#{@server_root}/httpd.pid")
@@ -216,7 +216,7 @@ class Apache2Controller
 			return false
 		end
 	end
-	
+
 	# Defines a configuration snippet to be added to the Apache configuration file.
 	def <<(line)
 		@extra << line
@@ -226,32 +226,32 @@ private
 	def get_binding
 		return binding
 	end
-	
+
 	def write_config_file
 		template = ERB.new(File.read("#{STUB_DIR}/httpd.conf.erb"))
 		File.open("#{@server_root}/httpd.conf", 'w') do |f|
 			f.write(template.result(get_binding))
 		end
 	end
-	
+
 	def modules_dir
 		@@modules_dir ||= `#{PlatformInfo.apxs2} -q LIBEXECDIR`.strip
 	end
-	
+
 	def builtin_modules
 		@@builtin_modules ||= `#{PlatformInfo.httpd} -l`.split("\n").grep(/\.c$/).map do |line|
 			line.strip
 		end
 	end
-	
+
 	def has_builtin_module?(name)
 		return builtin_modules.include?(name)
 	end
-	
+
 	def has_module?(name)
 		return File.exist?("#{modules_dir}/#{name}")
 	end
-	
+
 	def we_are_root?
 		return Process.uid == 0
 	end

data/test/support/nginx_controller.rb

@@ -15,10 +15,10 @@ class NginxController
 	PlatformInfo = PhusionPassenger::PlatformInfo
 	TEMPLATE_DIR = File.expand_path(File.dirname(__FILE__) + "/../stub/nginx")
 	PORT = 64507
-	
+
 	def initialize(root_dir)
 		root_dir     = File.expand_path(root_dir)
-		@passenger_root = PhusionPassenger.source_root
+		@passenger_root = PhusionPassenger.install_spec
 		@nginx_root  = root_dir
 		@port        = PORT
 		@config_file = "#{root_dir}/nginx.conf"
@@ -33,22 +33,22 @@ class NginxController
 			:timeout       => 25,
 			:before_start  => method(:write_nginx_config_files)
 		)
-		
+
 		@servers = []
 		@max_pool_size = 1
 	end
-	
+
 	def set(options)
 		options.each_pair do |key, value|
 			instance_variable_set("@#{key}", value)
 		end
 	end
-	
+
 	def start
 		stop
 		@controller.start
 	end
-	
+
 	def stop
 		@controller.stop
 		# On OS X, the Nginx server socket may linger around for a while
@@ -58,15 +58,15 @@ class NginxController
 			!@controller.send(:ping_socket, Socket::Constants::AF_INET, sockaddr)
 		end
 	end
-	
+
 	def running?
 		return @controller.running?
 	end
-	
+
 	def port
 		return @port
 	end
-	
+
 	def add_server
 		server = Server.new
 		yield server
@@ -77,19 +77,19 @@ private
 	class Server
 		attr_accessor :values
 		attr_accessor :extra
-		
+
 		def initialize
 			@values = { :passenger_enabled => "on" }
 		end
-		
+
 		def [](key)
 			return @values[key]
 		end
-		
+
 		def []=(key, value)
 			@values[key] = value
 		end
-		
+
 		def <<(text)
 			@extra = text
 		end
@@ -99,7 +99,7 @@ private
 		template = ERB.new(File.read("#{TEMPLATE_DIR}/nginx.conf.erb"))
 		File.write(@config_file, template.result(get_binding))
 	end
-	
+
 	def get_binding
 		return binding
 	end

data/test/support/test_helper.rb

@@ -1,19 +1,29 @@
+# Clean Bundler environment variables. Otherwise we can't test against multiple Rails versions.
+if defined?(Bundler)
+	clean_env = nil
+	Bundler.with_clean_env do
+		clean_env = ENV.to_hash
+	end
+	ENV.replace(clean_env)
+end
+
 require 'fileutils'
 require 'resolv'
 require 'net/http'
 require 'uri'
 require 'support/multipart'
+PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'debug_logging'
 PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 
 # Module containing helper methods, to be included in unit tests.
 module TestHelper
 	######## Stub helpers ########
-	
+
 	class Stub
 		attr_reader :app_root
 		attr_reader :full_app_root
-		
+
 		def self.use(name, app_root = nil)
 			stub = new(name, app_root)
 			begin
@@ -22,13 +32,13 @@ module TestHelper
 				stub.destroy
 			end
 		end
-		
+
 		def initialize(name, app_root = nil)
 			@name = name
 			if !File.exist?(stub_source_dir)
 				raise Errno::ENOENT, "Stub '#{name}' not found."
 			end
-			
+
 			if app_root
 				@app_root = app_root
 			else
@@ -41,7 +51,7 @@ module TestHelper
 			copy_stub_contents
 			system("chmod", "-R", "a+rw", @full_app_root)
 		end
-		
+
 		def reset
 			# Empty directory without removing the directory itself,
 			# allowing processes with this directory as current working
@@ -52,67 +62,57 @@ module TestHelper
 			files.delete("#{@full_app_root}/..")
 			FileUtils.chmod_R(0777, files)
 			FileUtils.rm_rf(files)
-			
+
 			copy_stub_contents
 			system("chmod", "-R", "a+rw", @full_app_root)
 		end
-		
+
 		def move(new_app_root)
 			File.rename(@full_app_root, new_app_root)
 			@app_root = new_app_root
 			@full_app_root = File.expand_path(new_app_root)
 		end
-		
+
 		def destroy
 			remove_dir_tree(@full_app_root)
 		end
-		
+
 		def full_app_root
 			return File.expand_path(@app_root)
 		end
-		
+
 		def public_file(name)
 			return File.binread("#{@full_app_root}/public/#{name}")
 		end
-	
+
 	private
 		def stub_source_dir
 			return "stub/#{@name}"
 		end
-		
+
 		def copy_stub_contents
 			FileUtils.cp_r("#{stub_source_dir}/.", @full_app_root)
 		end
 	end
-	
-	class ClassicRailsStub < Stub
-		def self.use(name, app_root = nil)
-			stub = new(name, app_root)
-			begin
-				yield stub
-			ensure
-				stub.destroy
-			end
-		end
-		
+
+	class RackStub < Stub
 		def startup_file
-			return environment_rb
-		end
-		
-		def environment_rb
-			return "#{@full_app_root}/config/environment.rb"
+			return "#{@full_app_root}/config.ru"
 		end
-		
+
 	private
 		def copy_stub_contents
 			super
-			FileUtils.mkdir_p("#{@full_app_root}/log")
-		end
-	end
-	
-	class RackStub < Stub
-		def startup_file
-			return "#{@full_app_root}/config.ru"
+			if PhusionPassenger.build_system_dir
+				build_system_dir = PhusionPassenger.build_system_dir
+				if !File.exist?("#{@full_app_root}/Gemfile")
+					FileUtils.cp("#{build_system_dir}/Gemfile", @full_app_root)
+					FileUtils.cp("#{build_system_dir}/Gemfile.lock", @full_app_root)
+					if File.exist?("#{build_system_dir}/.bundle")
+						FileUtils.cp_r("#{build_system_dir}/.bundle", @full_app_root)
+					end
+				end
+			end
 		end
 	end
 
@@ -127,7 +127,7 @@ module TestHelper
 			return "#{@full_app_root}/app.js"
 		end
 	end
-	
+
 	def describe_rails_versions(matcher, &block)
 		if ENV['ONLY_RAILS_VERSION'] && !ENV['ONLY_RAILS_VERSION'].empty?
 			found_versions = [ENV['ONLY_RAILS_VERSION']]
@@ -145,7 +145,7 @@ module TestHelper
 				end
 			end
 		end
-		
+
 		case matcher
 		when /^<= (.+)$/
 			max_version = $1
@@ -165,7 +165,7 @@ module TestHelper
 		else
 			raise ArgumentError, "Unknown matcher string '#{matcher}'"
 		end
-		
+
 		found_versions.sort.each do |version|
 			klass = describe("Rails #{version}", &block)
 			klass.send(:define_method, :rails_version) do
@@ -173,12 +173,12 @@ module TestHelper
 			end
 		end
 	end
-	
-	
+
+
 	######## HTTP helpers ########
 	# Before using these methods, one must set the '@server' instance variable
 	# and implement the start_web_server_if_necessary method.
-	
+
 	def get(uri)
 		if @server.nil?
 			raise "You must set the '@server' instance variable before get() can be used. For example, @server = 'http://mydomain.test/'"
@@ -186,7 +186,7 @@ module TestHelper
 		start_web_server_if_necessary
 		return Net::HTTP.get(URI.parse("#{@server}#{uri}"))
 	end
-	
+
 	def get_response(uri)
 		if @server.nil?
 			raise "You must set the '@server' instance variable before get() can be used. For example, @server = 'http://mydomain.test/'"
@@ -194,7 +194,7 @@ module TestHelper
 		start_web_server_if_necessary
 		return Net::HTTP.get_response(URI.parse("#{@server}#{uri}"))
 	end
-	
+
 	def post(uri, params = {})
 		if @server.nil?
 			raise "You must set the '@server' instance variable before get() can be used. For example, @server = 'http://mydomain.test/'"
@@ -211,7 +211,7 @@ module TestHelper
 			return Net::HTTP.post_form(url, params).body
 		end
 	end
-	
+
 	def check_hosts_configuration
 		begin
 			ok = Resolv.getaddress("passenger.test") == "127.0.0.1"
@@ -239,24 +239,24 @@ module TestHelper
 			exit!
 		end
 	end
-	
-	
+
+
 	######## Other helpers ########
-	
+
 	def when_user_switching_possible
 		if Process.euid == 0
 			yield
 		end
 	end
-	
+
 	alias when_running_as_root when_user_switching_possible
-	
+
 	def when_not_running_as_root
 		if Process.euid != 0
 			yield
 		end
 	end
-	
+
 	def eventually(deadline_duration = 2, check_interval = 0.05)
 		deadline = Time.now + deadline_duration
 		while Time.now < deadline
@@ -268,7 +268,7 @@ module TestHelper
 		end
 		raise "Time limit exceeded"
 	end
-	
+
 	def should_never_happen(deadline_duration = 1, check_interval = 0.05)
 		deadline = Time.now + deadline_duration
 		while Time.now < deadline
@@ -279,7 +279,7 @@ module TestHelper
 			end
 		end
 	end
-	
+
 	def remove_dir_tree(dir)
 		# FileUtils.chmod_R is susceptible to race conditions:
 		# if another thread/process deletes a file just before
@@ -297,7 +297,7 @@ module TestHelper
 		end
 		FileUtils.rm_rf(dir)
 	end
-	
+
 	def spawn_process(*args)
 		args.map! do |arg|
 			arg.to_s
@@ -310,7 +310,7 @@ module TestHelper
 			end
 		end
 	end
-	
+
 	# Run a script in a Ruby subprocess. *args are program arguments to
 	# pass to the script. Returns the script's stdout output.
 	def run_script(code, *args)
@@ -360,21 +360,20 @@ module TestHelper
 		rescue Errno::ECHILD, Errno::ESRCH
 		end
 	end
-	
-	def spawn_logging_agent(dump_file, password)
-		passenger_tmpdir = PhusionPassenger::Utils.passenger_tmpdir
-		socket_filename = "#{passenger_tmpdir}/logging.socket"
-		pid = spawn_process("#{PhusionPassenger.agents_dir}/PassengerLoggingAgent",
-			"passenger_root", PhusionPassenger.source_root,
-			"log_level", PhusionPassenger::DebugLogging.log_level,
-			"analytics_dump_file", dump_file,
-			"analytics_log_user",  CONFIG['normal_user_1'],
-			"analytics_log_group", CONFIG['normal_group_1'],
-			"analytics_log_permissions", "u=rwx,g=rwx,o=rwx",
-			"logging_agent_address", "unix:#{socket_filename}",
-			"logging_agent_password", password,
-			"logging_agent_admin_address", "unix:#{socket_filename}_admin",
-			"admin_tool_status_password", password)
+
+	def spawn_logging_agent(tmpdir, dump_file, password)
+		socket_filename = "#{tmpdir}/logging.socket"
+		password_filename = "#{tmpdir}/password"
+		File.write(password_filename, password)
+		pid = spawn_process("#{PhusionPassenger.support_binaries_dir}/#{PhusionPassenger::AGENT_EXE}",
+			"logger",
+			"--passenger-root", PhusionPassenger.install_spec,
+			"--log-level", PhusionPassenger::DebugLogging.log_level,
+			"--dump-file", dump_file,
+			"--user",  CONFIG['normal_user_1'],
+			"--group", CONFIG['normal_group_1'],
+			"--listen", "unix:#{socket_filename}",
+			"--password-file", password_filename)
 		eventually do
 			File.exist?(socket_filename)
 		end
@@ -386,7 +385,7 @@ module TestHelper
 		end
 		raise e
 	end
-	
+
 	def flush_logging_agent(password, socket_address)
 		PhusionPassenger.require_passenger_lib 'message_client' if !defined?(PhusionPassenger::MessageClient)
 		client = PhusionPassenger::MessageClient.new("logging", password, socket_address)
@@ -397,7 +396,7 @@ module TestHelper
 			client.close
 		end
 	end
-	
+
 	def inspect_server(name)
 		instance = PhusionPassenger::AdminTools::ServerInstance.list.first
 		if name
@@ -428,7 +427,7 @@ File.class_eval do
 			f.write(original_content)
 		end
 	end
-	
+
 	def self.append(filename, data)
 		File.open(filename, 'a') do |f|
 			f.write(data)
@@ -443,12 +442,12 @@ File.class_eval do
 			f.write(content)
 		end
 	end
-	
+
 	def self.touch(filename, timestamp = nil)
 		File.open(filename, 'w').close
 		File.utime(timestamp, timestamp, filename) if timestamp
 	end
-	
+
 	def self.binread(filename)
 		return File.read(filename)
 	end if !respond_to?(:binread)