passenger 4.0.30 → 4.0.31

data/test/integration_tests/source_packaging_test.rb

@@ -25,7 +25,8 @@ SOURCE_ROOT = File.expand_path("../..", File.dirname(__FILE__))
 Dir.chdir(SOURCE_ROOT)
 $LOAD_PATH.unshift("#{SOURCE_ROOT}/lib")
 require 'phusion_passenger'
-require 'phusion_passenger/packaging'
+PhusionPassenger.locate_directories
+PhusionPassenger.require_passenger_lib 'packaging'
 require 'rubygems'
 require 'tmpdir'
 require 'fileutils'

data/test/integration_tests/standalone_tests.rb

@@ -2,7 +2,8 @@ source_root = File.expand_path("../..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
 require 'phusion_passenger'
 PhusionPassenger.locate_directories
-require 'phusion_passenger/platform_info/binary_compatibility'
+PhusionPassenger.require_passenger_lib 'constants'
+PhusionPassenger.require_passenger_lib 'platform_info/binary_compatibility'
 require 'tmpdir'
 require 'fileutils'
 require 'webrick'
@@ -16,6 +17,8 @@ ENV.delete('PASSENGER_DEBUG')
 ENV['PASSENGER_DOWNLOAD_NATIVE_SUPPORT_BINARY'] = '0'
 ENV['PASSENGER_COMPILE_NATIVE_SUPPORT_BINARY']  = '0'
 
+module PhusionPassenger
+
 describe "Passenger Standalone" do
 	after :each do
 		ENV.delete('PASSENGER_DEBUG')
@@ -85,11 +88,11 @@ describe "Passenger Standalone" do
 	end
 
 	def create_dummy_nginx_binary
-		File.open("nginx", "w") do |f|
+		File.open("PassengerWebHelper", "w") do |f|
 			f.puts "#!/bin/bash"
 			f.puts "echo nginx version: 1.0.0"
 		end
-		File.chmod(0755, "nginx")
+		File.chmod(0755, "PassengerWebHelper")
 	end
 
 	def create_file(filename, contents = nil)
@@ -114,10 +117,10 @@ describe "Passenger Standalone" do
 	end
 
 	describe "start command" do
-		SUPPORT_BINARIES_DOWNLOAD_MESSAGE = "Downloading Passenger support binaries for your platform, if available"
-		NGINX_BINARY_DOWNLOAD_MESSAGE = "Downloading Nginx binary for your platform, if available"
-		NGINX_SOURCE_DOWNLOAD_MESSAGE = "Downloading Nginx..."
-		COMPILING_MESSAGE = "Installing Phusion Passenger Standalone"
+		SUPPORT_BINARIES_DOWNLOAD_MESSAGE = " --> Downloading #{PROGRAM_NAME} support binaries for your platform"
+		NGINX_BINARY_DOWNLOAD_MESSAGE = "Downloading web helper for your platform"
+		NGINX_SOURCE_DOWNLOAD_MESSAGE = "Downloading web helper source code..."
+		COMPILING_MESSAGE = "Installing #{PROGRAM_NAME} Standalone..."
 
 		def test_serving_application(passenger_command)
 			Dir.chdir(@runtime_dir) do
@@ -150,7 +153,7 @@ describe "Passenger Standalone" do
 
 				Dir.mkdir("#{@webroot}/#{version}")
 				Dir.chdir("#{@webroot}/#{version}") do
-					create_tarball("nginx-#{nginx_version}-#{compat_id}.tar.gz") do
+					create_tarball("webhelper-#{nginx_version}-#{compat_id}.tar.gz") do
 						create_dummy_nginx_binary
 					end
 					create_tarball("support-#{compat_id}.tar.gz") do
@@ -198,16 +201,16 @@ describe "Passenger Standalone" do
 					test_serving_application(command)
 				end
 
-				specify "if the downloaded support binaries work but the download Nginx binary doesn't, " +
-					"and Nginx compilation doesn't succeed the first time, then Nginx compilation " +
+				specify "if the downloaded support binaries work but the downloaded web helper binary doesn't, " +
+					"and web helper compilation doesn't succeed the first time, then web helper compilation " +
 					"succeeds the second time" do
 					Dir.chdir("#{@webroot}/#{version}") do
 						create_tarball("support-#{compat_id}.tar.gz") do
 							FileUtils.cp_r(Dir["#{PhusionPassenger.source_root}/buildout/*"],
 								".")
 						end
-						create_tarball("nginx-#{nginx_version}-#{compat_id}.tar.gz") do
-							create_file("nginx",
+						create_tarball("webhelper-#{nginx_version}-#{compat_id}.tar.gz") do
+							create_file("PassengerWebHelper",
 								"#!/bin/sh\n" +
 								"exit 1\n")
 						end
@@ -225,10 +228,10 @@ describe "Passenger Standalone" do
 						@output = `#{command} --runtime-check-only --no-compile-runtime 2>&1`
 						$?.exitstatus.should_not == 0
 						@output.should include(SUPPORT_BINARIES_DOWNLOAD_MESSAGE)
-						@output.should include("All support binaries are usable.")
+						@output.should include("All good\n")
 						@output.should include(NGINX_BINARY_DOWNLOAD_MESSAGE)
-						@output.should include("Nginx binary is not usable.")
-						@output.should include("Refusing to compile the Phusion Passenger Standalone")
+						@output.should include("Not usable, will compile from source")
+						@output.should include("Refusing to compile the Phusion Passenger Standalone runtime")
 
 						@output = capture_output("#{command} --runtime-check-only")
 						@output.should include(NGINX_SOURCE_DOWNLOAD_MESSAGE)
@@ -255,18 +258,28 @@ describe "Passenger Standalone" do
 			context "when natively packaged" do
 				before :each do
 					sh "passenger-config --make-locations-ini > '#{@runtime_dir}/locations.ini'"
+					File.open("#{@runtime_dir}/locations.ini", "r+") do |f|
+						data = f.read
+						data.sub!(/natively_packaged=.*/, 'natively_packaged=true')
+						if !data.sub!(/native_packaging_method=.*/, 'native_packaging_method=deb')
+							data << "native_packaging_method=deb\n"
+						end
+						f.rewind
+						f.truncate(0)
+						f.write(data)
+					end
 					ENV['PASSENGER_LOCATION_CONFIGURATION_FILE'] = "#{@runtime_dir}/locations.ini"
-					create_file("#{PhusionPassenger.lib_dir}/nginx")
+					create_file("#{PhusionPassenger.lib_dir}/PassengerWebHelper")
 				end
 
 				after :each do
 					ENV.delete('PASSENGER_LOCATION_CONFIGURATION_FILE')
-					File.unlink("#{PhusionPassenger.lib_dir}/nginx")
+					File.unlink("#{PhusionPassenger.lib_dir}/PassengerWebHelper")
 				end
 
 				it "downloads only the Nginx binary from the Internet" do
-					File.rename("#{@webroot}/#{version}/nginx-#{nginx_version}-#{compat_id}.tar.gz",
-						"#{@webroot}/#{version}/nginx-0.0.1-#{compat_id}.tar.gz")
+					File.rename("#{@webroot}/#{version}/webhelper-#{nginx_version}-#{compat_id}.tar.gz",
+						"#{@webroot}/#{version}/webhelper-0.0.1-#{compat_id}.tar.gz")
 					@output = capture_output("passenger start " +
 						"--runtime-dir '#{@runtime_dir}' " +
 						"--runtime-check-only " +
@@ -321,3 +334,5 @@ describe "Passenger Standalone" do
 		end
 	end
 end
+
+end # module PhusionPassenger

data/test/ruby/admin_tools_spec.rb

@@ -1,9 +1,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'fileutils'
-require 'phusion_passenger/constants'
-require 'phusion_passenger/utils'
-require 'phusion_passenger/admin_tools'
-require 'phusion_passenger/admin_tools/server_instance'
+PhusionPassenger.require_passenger_lib 'constants'
+PhusionPassenger.require_passenger_lib 'utils'
+PhusionPassenger.require_passenger_lib 'admin_tools'
+PhusionPassenger.require_passenger_lib 'admin_tools/server_instance'
 
 module PhusionPassenger
 

data/test/ruby/analytics_logger_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'stringio'
-require 'phusion_passenger/analytics_logger'
+PhusionPassenger.require_passenger_lib 'analytics_logger'
 
 module PhusionPassenger
 

data/test/ruby/debug_logging_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'phusion_passenger/debug_logging'
-require 'phusion_passenger/utils/tmpdir'
+PhusionPassenger.require_passenger_lib 'debug_logging'
+PhusionPassenger.require_passenger_lib 'utils/tmpdir'
 require 'stringio'
 
 module PhusionPassenger

data/test/ruby/message_channel_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'socket'
-require 'phusion_passenger/message_channel'
+PhusionPassenger.require_passenger_lib 'message_channel'
 
 module PhusionPassenger
 

data/test/ruby/request_handler_spec.rb

@@ -1,9 +1,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'phusion_passenger/request_handler'
-require 'phusion_passenger/request_handler/thread_handler'
-require 'phusion_passenger/rack/thread_handler_extension'
-require 'phusion_passenger/analytics_logger'
-require 'phusion_passenger/utils'
+PhusionPassenger.require_passenger_lib 'request_handler'
+PhusionPassenger.require_passenger_lib 'request_handler/thread_handler'
+PhusionPassenger.require_passenger_lib 'rack/thread_handler_extension'
+PhusionPassenger.require_passenger_lib 'analytics_logger'
+PhusionPassenger.require_passenger_lib 'utils'
 
 require 'fileutils'
 
@@ -328,78 +328,185 @@ describe RequestHandler do
 		hijack_callback_called.should == true
 	end
 
-	describe "on GET requests that may have a body" do
-		before :each do
-			@options["thread_handler"] = Class.new(RequestHandler::ThreadHandler) do
-				include Rack::ThreadHandlerExtension
-			end
+	specify "GET requests with Content-Length are assumed to have a request body" do
+		@options["thread_handler"] = Class.new(RequestHandler::ThreadHandler) do
+			include Rack::ThreadHandlerExtension
 		end
 
-		it "allows reading from the client socket" do
-			lambda_called = false
+		lambda_called = false
 
-			@options["app"] = lambda do |env|
-				lambda_called = true
-				env['rack.input'].read(3).should == "abc"
-				[200, {}, ["ok"]]
-			end
+		@options["app"] = lambda do |env|
+			lambda_called = true
+			env['rack.input'].read(3).should == "abc"
+			[200, {}, ["ok"]]
+		end
 
-			@request_handler = RequestHandler.new(@owner_pipe[1], @options)
-			@request_handler.start_main_loop_thread
-			client = connect
-			begin
-				send_binary_request(client,
-					"REQUEST_METHOD" => "GET",
-					"PATH_INFO" => "/",
-					"CONTENT_LENGTH" => "3")
-				client.write("abc")
-				client.close_write
-				client.read.should ==
-					"Status: 200\r\n" +
-					"\r\n" +
-					"ok"
-			ensure
-				client.close
-			end
+		@request_handler = RequestHandler.new(@owner_pipe[1], @options)
+		@request_handler.start_main_loop_thread
+		client = connect
+		begin
+			send_binary_request(client,
+				"REQUEST_METHOD" => "GET",
+				"PATH_INFO" => "/",
+				"CONTENT_LENGTH" => "3")
+			client.write("abc")
+			client.close_write
+			client.read.should ==
+				"Status: 200\r\n" +
+				"\r\n" +
+				"ok"
+		ensure
+			client.close
+		end
 
-			lambda_called.should be_true
+		lambda_called.should be_true
+	end
+
+	specify "GET requests with Transfer-Encoding are assumed to have a request body" do
+		@options["thread_handler"] = Class.new(RequestHandler::ThreadHandler) do
+			include Rack::ThreadHandlerExtension
 		end
+
+		lambda_called = false
+
+		@options["app"] = lambda do |env|
+			lambda_called = true
+			env['rack.input'].read(13).should ==
+				"3\r\n" +
+				"abc\r\n" +
+				"0\r\n\r\n"
+			[200, {}, ["ok"]]
+		end
+
+		@request_handler = RequestHandler.new(@owner_pipe[1], @options)
+		@request_handler.start_main_loop_thread
+		client = connect
+		begin
+			send_binary_request(client,
+				"REQUEST_METHOD" => "GET",
+				"PATH_INFO" => "/",
+				"HTTP_TRANSFER_ENCODING" => "chunked")
+			client.write(
+				"3\r\n" +
+				"abc\r\n" +
+				"0\r\n\r\n")
+			client.close_write
+			client.read.should ==
+				"Status: 200\r\n" +
+				"\r\n" +
+				"ok"
+		ensure
+			client.close
+		end
+
+		lambda_called.should be_true
 	end
 
-	describe "on GET requests that are not supposed to have a body" do
-		before :each do
-			@options["thread_handler"] = Class.new(RequestHandler::ThreadHandler) do
-				include Rack::ThreadHandlerExtension
-			end
+	specify "GET requests with neither Content-Length nor Transfer-Encoding are assumed to have no request body" do
+		@options["thread_handler"] = Class.new(RequestHandler::ThreadHandler) do
+			include Rack::ThreadHandlerExtension
 		end
 
-		it "disallows reading from the client socket" do
-			lambda_called = false
+		lambda_called = false
 
-			@options["app"] = lambda do |env|
-				lambda_called = true
-				env['rack.input'].read(1).should be_nil
-				env['rack.input'].gets.should be_nil
-				[200, {}, ["ok"]]
-			end
+		@options["app"] = lambda do |env|
+			lambda_called = true
+			env['rack.input'].read(1).should be_nil
+			env['rack.input'].gets.should be_nil
+			[200, {}, ["ok"]]
+		end
 
-			@request_handler = RequestHandler.new(@owner_pipe[1], @options)
-			@request_handler.start_main_loop_thread
-			client = connect
-			begin
-				send_binary_request(client,
-					"REQUEST_METHOD" => "GET",
-					"PATH_INFO" => "/")
-				client.close_write
-				client.read.should ==
-					"Status: 200\r\n" +
-					"\r\n" +
-					"ok"
-			ensure
-				client.close
-			end
+		@request_handler = RequestHandler.new(@owner_pipe[1], @options)
+		@request_handler.start_main_loop_thread
+		client = connect
+		begin
+			send_binary_request(client,
+				"REQUEST_METHOD" => "GET",
+				"PATH_INFO" => "/")
+			client.close_write
+			client.read.should ==
+				"Status: 200\r\n" +
+				"\r\n" +
+				"ok"
+		ensure
+			client.close
+		end
 
-			lambda_called.should be_true
+		lambda_called.should be_true
+	end
+
+	specify "GET requests with Content-Length 0 are assumed to have no request body" do
+		@options["thread_handler"] = Class.new(RequestHandler::ThreadHandler) do
+			include Rack::ThreadHandlerExtension
+		end
+
+		lambda_called = false
+
+		@options["app"] = lambda do |env|
+			lambda_called = true
+			env['rack.input'].read(1).should be_nil
+			env['rack.input'].gets.should be_nil
+			[200, {}, ["ok"]]
+		end
+
+		@request_handler = RequestHandler.new(@owner_pipe[1], @options)
+		@request_handler.start_main_loop_thread
+		client = connect
+		begin
+			send_binary_request(client,
+				"REQUEST_METHOD" => "GET",
+				"PATH_INFO" => "/",
+				"CONTENT_LENGTH" => "0")
+			client.close_write
+			client.read.should ==
+				"Status: 200\r\n" +
+				"\r\n" +
+				"ok"
+		ensure
+			client.close
+		end
+
+		lambda_called.should be_true
+	end
+
+	specify "non-GET requests are assumed to have a request body, even those without Content-Length and Transfer-Encoding" do
+		@options["thread_handler"] = Class.new(RequestHandler::ThreadHandler) do
+			include Rack::ThreadHandlerExtension
+		end
+
+		lambda_called = false
+
+		@options["app"] = lambda do |env|
+			lambda_called = true
+			env['rack.input'].read(3).should == "abc"
+			[200, {}, ["ok"]]
+		end
+
+		@request_handler = RequestHandler.new(@owner_pipe[1], @options)
+		@request_handler.start_main_loop_thread
+		client = connect
+		begin
+			send_binary_request(client,
+				"REQUEST_METHOD" => "POST",
+				"PATH_INFO" => "/")
+			client.write("abc")
+			client.close_write
+			client.read.should ==
+				"Status: 200\r\n" +
+				"\r\n" +
+				"ok"
+		ensure
+			client.close
+		end
+
+		lambda_called.should be_true
+	end
+
+	describe "on GET requests that are not supposed to have a body" do
+		before :each do
+			@options["thread_handler"] = Class.new(RequestHandler::ThreadHandler) do
+				include Rack::ThreadHandlerExtension
+			end
 		end
 
 		it "allows reading from the client socket once the socket has been fully hijacked" do

data/test/ruby/shared/loader_sharedspec.rb

@@ -1,6 +1,6 @@
 require 'socket'
-require 'phusion_passenger/utils'
-require 'phusion_passenger/message_channel'
+PhusionPassenger.require_passenger_lib 'utils'
+PhusionPassenger.require_passenger_lib 'message_channel'
 
 module PhusionPassenger
 
@@ -234,12 +234,12 @@ shared_examples_for "a loader" do
 		result[:status].should == "Ready"
 		headers, body = perform_request(
 			"REQUEST_METHOD" => "GET",
-			"PATH_INFO" => "/hello",
+			"PATH_INFO" => "/",
 			# For Rails 2
-			"REQUEST_URI" => "/hello"
+			"REQUEST_URI" => "/"
 		)
 		headers["Status"].should == "200"
-		body.should == "hello world"
+		body.should == "front page"
 	end
 end