passenger 4.0.0.rc4 → 4.0.0.rc6

data/passenger.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 	s.version = PhusionPassenger::VERSION_STRING
 	s.rubyforge_project = "passenger"
 	s.author = "Phusion - http://www.phusion.nl/"
-	s.email = "info@phusion.nl"
+	s.email = "software-signing@phusion.nl"
 	s.require_paths = ["lib"]
 	s.add_dependency 'rake', '>= 0.8.1'
 	s.add_dependency 'daemon_controller', '>= 1.1.0'

data/resources/templates/apache2/config_snippets.txt.erb

@@ -4,7 +4,7 @@ Please edit your Apache configuration file, and add these lines:
 
    <b>LoadModule passenger_module <%= @module_location %></b>
    <b>PassengerRoot <%= @passenger_root %></b>
-   <b>PassengerRuby <%= @ruby %></b>
+   <b>PassengerDefaultRuby <%= @ruby %></b>
 
 After you restart Apache, you are ready to deploy any number of Ruby on Rails
 applications on Apache, without any further Ruby on Rails-specific

data/test/cxx/ApplicationPool2/PoolTest.cpp

@@ -1116,18 +1116,13 @@ namespace tut {
 	TEST_METHOD(64) {
 		// Test process idle cleaning.
 		Options options = createOptions();
-		retainSessions = true;
 		pool->setMaxIdleTime(50000);
-		pool->asyncGet(options, callback);
-		pool->asyncGet(options, callback);
-		EVENTUALLY(2,
-			result = number == 2;
-		);
+		SessionPtr session1 = pool->get(options, &ticket);
+		SessionPtr session2 = pool->get(options, &ticket);
 		ensure_equals(pool->getProcessCount(), 2u);
-		
-		currentSession.reset();
-		sessions.pop_back();
 
+		session2.reset();
+		
 		// One of the processes still has a session open and should
 		// not be idle cleaned.
 		EVENTUALLY(2,

data/test/cxx/RequestHandlerTest.cpp

@@ -801,7 +801,7 @@ namespace tut {
 		{
 			unique_lock<boost::mutex> lock(pool->syncher);
 			origProcess = pool->superGroups.get(wsgiAppPath)->defaultGroup->disablingProcesses.front();
-			ensure(origProcess->oobwRequested);
+			ensure(origProcess->oobwStatus == Process::OOBW_REQUESTED);
 		}
 		ensure("sanity check", origPid == origProcess->pid); // just a sanity check
 		
@@ -822,15 +822,15 @@ namespace tut {
 		// Wait for the original process to finish oobw request.
 		EVENTUALLY(2,
 			unique_lock<boost::mutex> lock(pool->syncher);
-			result = !origProcess->oobwRequested;
+			result = origProcess->oobwStatus == Process::OOBW_NOT_ACTIVE;
 		);
 		
 		// Final asserts.
 		{
 			unique_lock<boost::mutex> lock(pool->syncher);
-			ensure("2 enabled processes", pool->superGroups.get(wsgiAppPath)->defaultGroup->enabledProcesses.size() == 2);
-			ensure("oobw is reset", !origProcess->oobwRequested);
-			ensure("process is enabled", origProcess->enabled == Process::ENABLED);
+			ensure_equals("2 enabled processes", pool->superGroups.get(wsgiAppPath)->defaultGroup->enabledProcesses.size(), 2u);
+			ensure_equals("oobw is reset", origProcess->oobwStatus, Process::OOBW_NOT_ACTIVE);
+			ensure_equals("process is enabled", origProcess->enabled, Process::ENABLED);
 		}
 	}
 

data/test/ruby/classic_rails/loader_spec.rb

@@ -42,6 +42,6 @@ describe "Classic Rails 2.3 loader" do
 			"end of startup file\n" +
 			"worker_process_started: forked=false\n"
 	end
-end
+end if TEST_CLASSIC_RAILS
 
 end # module PhusionPassenger

data/test/ruby/classic_rails/preloader_spec.rb

@@ -48,6 +48,6 @@ describe "Classic Rails 2.3 preloader" do
 			"end of startup file\n" +
 			"worker_process_started: forked=true\n"
 	end
-end
+end if TEST_CLASSIC_RAILS
 
 end # module PhusionPassenger

data/test/ruby/request_handler_spec.rb

@@ -187,6 +187,68 @@ describe RequestHandler do
 		end
 	end
 
+	it "catches exceptions generated by the Rack application object" do
+		@options["thread_handler"] = Class.new(RequestHandler::ThreadHandler) do
+			include Rack::ThreadHandlerExtension
+		end
+
+		lambda_called = false
+
+		# Here we test that the exception is not propagated to outside the request handler.
+		DebugLogging.log_level = -2
+		@options["app"] = lambda do |env|
+			lambda_called = true
+			raise "an error"
+		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.read
+		ensure
+			client.close
+		end
+
+		lambda_called.should == true
+	end
+
+	it "catches exceptions generated by the Rack body object" do
+		@options["thread_handler"] = Class.new(RequestHandler::ThreadHandler) do
+			include Rack::ThreadHandlerExtension
+		end
+
+		lambda_called = false
+
+		# Here we test that the exception is not propagated to outside the request handler.
+		DebugLogging.log_level = -2
+		@options["app"] = lambda do |env|
+			lambda_called = true
+			body = Object.new
+			def body.each
+				raise "an error"
+			end
+			[200, { "Content-Type" => "text/plain" }, body]
+		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.read
+		ensure
+			client.close
+		end
+
+		lambda_called.should == true
+	end
+
 	it "allows the application to take over the socket completely through the full hijack API" do
 		@options["thread_handler"] = Class.new(RequestHandler::ThreadHandler) do
 			include Rack::ThreadHandlerExtension
@@ -265,7 +327,151 @@ describe RequestHandler do
 		lambda_called.should == true
 		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
+		end
+
+		it "allows reading from the client socket" do
+			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" => "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
+		end
+	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 "disallows reading from the client socket" do
+			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" => "/")
+				client.close_write
+				client.read.should ==
+					"Status: 200\r\n" +
+					"\r\n" +
+					"ok"
+			ensure
+				client.close
+			end
+
+			lambda_called.should be_true
+		end
+
+		it "allows reading from the client socket once the socket has been fully hijacked" do
+			lambda_called = false
+
+			@options["app"] = lambda do |env|
+				lambda_called = true
+				env['rack.hijack'].call
+				io = env['rack.hijack_io']
+				begin
+					io.read.should == "hi"
+					io.write("ok")
+				ensure
+					io.close
+				end
+			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.write("hi")
+				client.close_write
+				client.read.should == "ok"
+			ensure
+				client.close
+			end
+
+			lambda_called.should be_true
+		end
+
+		it "allows reading from the client socket once the socket has been partially hijacked" do
+			lambda_called = false
+
+			@options["app"] = lambda do |env|
+				block = lambda do |io|
+					lambda_called = true
+					begin
+						io.read.should == "hi"
+						io.write("ok")
+					ensure
+						io.close
+					end
+				end
+				headers = { 'rack.hijack' => block }
+				[200, headers, []]
+			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.write("hi")
+				client.close_write
+				client.read.should ==
+					"Status: 200\r\n" +
+					"\r\n" +
+					"ok"
+			ensure
+				client.close
+			end
+
+			lambda_called.should be_true
+		end
+	end
+
 	describe "if analytics logger is given" do
 		def preinitialize
 			if @agent_pid

data/test/ruby/shared/loader_sharedspec.rb

@@ -121,6 +121,7 @@ private
 
 		if status == "Error\n"
 			body = @output.read
+			STDERR.puts "<--- #{body}" if DEBUG
 		end
 
 		return { :status => status.strip, :headers => headers, :body => body }

data/test/ruby/spec_helper.rb

@@ -16,7 +16,17 @@ rescue Errno::ENOENT
 	exit 1
 end
 
-DEBUG      = ['1', 'y', 'yes'].include?(ENV['DEBUG'].to_s.downcase)
+def boolean_option(name, default_value = false)
+	value = ENV[name]
+	if value.nil? || value.empty?
+		return default_value
+	else
+		return value == "yes" || value == "on" || value == "true" || value == "1"
+	end
+end
+
+DEBUG = boolean_option('DEBUG')
+TEST_CLASSIC_RAILS = boolean_option('TEST_CLASSIC_RAILS', true)
 AGENTS_DIR = "#{source_root}/agents"
 
 $LOAD_PATH.unshift("#{source_root}/lib")

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

@@ -36,7 +36,7 @@ Listen 127.0.0.1:<%= @port %>
 LoadModule passenger_module "<%= @mod_passenger %>"
 
 PassengerRoot "<%= @passenger_root %>"
-PassengerRuby "<%= PlatformInfo.ruby_command %>"
+PassengerDefaultRuby "<%= PlatformInfo.ruby_command %>"
 PassengerDefaultUser <%= CONFIG['default_user'] %>
 PassengerDefaultGroup <%= CONFIG['default_group'] %>
 PassengerTempDir "<%= @passenger_temp_dir %>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc4
+  version: 4.0.0.rc6
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Easy and robust Ruby web application deployment.
-email: info@phusion.nl
+email: software-signing@phusion.nl
 executables:
 - passenger
 - passenger-install-apache2-module
@@ -243,6 +243,7 @@ files:
 - doc/users_guide_snippets/installation.txt
 - doc/users_guide_snippets/passenger_spawn_method.txt
 - doc/users_guide_snippets/rackup_specifications.txt
+- doc/users_guide_snippets/rvm_helper_tool.txt
 - doc/users_guide_snippets/since_version.txt
 - doc/users_guide_snippets/support_information.txt
 - doc/users_guide_snippets/tips.txt
@@ -2201,6 +2202,7 @@ files:
 - ext/ruby/extconf.rb
 - dev/copy_boost_headers.rb
 - dev/find_owner_pipe_leaks.rb
+- dev/googlecode_upload.py
 - dev/render_error_pages.rb
 - dev/run_travis.sh
 - resources/mime.types

metadata.gz.asc

@@ -0,0 +1,12 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+iQEcBAABAgAGBQJRZAnsAAoJECrHRaUKISqMnUkIALsTpow4UO6t7iY6uyUeVQg6
+We42umF91RGnAIPF/jhXwEhK5bmwxGgzYte8BBk79oh5U5+Y5WM4WwSnnKLRbiBO
+34SbieXr8gCSoPZIP8Jz34Zn6h7Rit+ETcasFkrq+PojmyeNeE+0ygU/nY+3GoQR
+5tx8M6wvpPhbjpbiWOqmf+kf5SJT3Kx6bLrJveHd+HEzQS6Gek8d8uif+d/hi3AT
+oUt/1L9AA/qX7H3ucuVNUA2ohMjuX1+vtFqezK6h6GcVwDvy91aepLGuCWn/TA2f
+wbExtgfZ8DHrW6y/whEbiii21ZlVohpIpbxshnu4/LtEYG42kkNM3ExgeoPV9/s=
+=EKr1
+-----END PGP SIGNATURE-----