passenger 4.0.38 → 4.0.39

data/test/integration_tests/native_packaging_spec.rb

@@ -113,7 +113,11 @@ describe "A natively packaged Phusion Passenger" do
 		if $?.exitstatus == 0
 			return output
 		else
-			abort "Command #{command} exited with status #{$?.exitstatus}"
+			filename = `mktemp /tmp/output.XXXXXX`.strip
+			File.open(filename, "w") do |f|
+				f.write(output)
+			end
+			abort "Command #{command} exited with status #{$?.exitstatus}. Output written to #{filename}"
 		end
 	end
 

data/test/ruby/request_handler_spec.rb

@@ -328,7 +328,7 @@ describe RequestHandler do
 		hijack_callback_called.should == true
 	end
 
-	specify "GET requests with Content-Length are assumed to have a request body" do
+	specify "requests with Content-Length are assumed to have a request body" do
 		@options["thread_handler"] = Class.new(RequestHandler::ThreadHandler) do
 			include Rack::ThreadHandlerExtension
 		end
@@ -362,7 +362,7 @@ describe RequestHandler do
 		lambda_called.should be_true
 	end
 
-	specify "GET requests with Transfer-Encoding are assumed to have a request body" do
+	specify "requests with Transfer-Encoding chunked are assumed to have a request body" do
 		@options["thread_handler"] = Class.new(RequestHandler::ThreadHandler) do
 			include Rack::ThreadHandlerExtension
 		end
@@ -402,7 +402,7 @@ describe RequestHandler do
 		lambda_called.should be_true
 	end
 
-	specify "GET requests with neither Content-Length nor Transfer-Encoding are assumed to have no request body" do
+	specify "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
@@ -416,72 +416,6 @@ describe RequestHandler do
 			[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
-
-	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
@@ -489,7 +423,6 @@ describe RequestHandler do
 			send_binary_request(client,
 				"REQUEST_METHOD" => "POST",
 				"PATH_INFO" => "/")
-			client.write("abc")
 			client.close_write
 			client.read.should ==
 				"Status: 200\r\n" +
@@ -502,7 +435,7 @@ describe RequestHandler do
 		lambda_called.should be_true
 	end
 
-	describe "on GET requests that are not supposed to have a body" do
+	describe "on requests that are not supposed to have a body" do
 		before :each do
 			@options["thread_handler"] = Class.new(RequestHandler::ThreadHandler) do
 				include Rack::ThreadHandlerExtension

data/test/ruby/utils/tee_input_spec.rb

@@ -0,0 +1,235 @@
+# encoding: binary
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+PhusionPassenger.require_passenger_lib 'utils/tee_input'
+require 'stringio'
+
+module PhusionPassenger
+
+shared_examples "TeeInput#gets" do
+	context "if Content-Length is given" do
+		before :each do
+			init_input("hello\nworld\nlast line!", "CONTENT_LENGTH" => 21)
+		end
+
+		it "reads a line, including newline character" do
+			@input.gets.should == "hello\n"
+			@input.gets.should == "world\n"
+		end
+
+		it "reads until EOF if no newline is encountered before EOF" do
+			@input.gets
+			@input.gets
+			@input.gets.should == "last line"
+		end
+
+		it "returns nil if EOF is reached" do
+			@input.gets
+			@input.gets
+			@input.gets
+			@input.gets.should be_nil
+		end
+	end
+
+	context "if Transfer-Encoding is chunked" do
+		before :each do
+			init_input("hello\nworld\nlast line", "HTTP_TRANSFER_ENCODING" => "chunked")
+		end
+
+		it "reads a line, including newline character" do
+			@input.gets.should == "hello\n"
+			@input.gets.should == "world\n"
+		end
+
+		it "reads until EOF if no newline is encountered before EOF" do
+			@input.gets
+			@input.gets
+			@input.gets.should == "last line"
+		end
+
+		it "returns nil if EOF is reached" do
+			@input.gets
+			@input.gets
+			@input.gets
+			@input.gets.should be_nil
+		end
+	end
+
+	context "if neither Content-Length nor Transfer-Encoding chunked are given" do
+		before :each do
+			init_input("hello\nworld\nlast line")
+		end
+
+		it "returns nil" do
+			@input.gets.should be_nil
+		end
+	end
+end
+
+shared_examples "TeeInput#read" do
+	describe "with no arguments" do
+		context "if Content-Length is given" do
+			before :each do
+				init_input("hello!", "CONTENT_LENGTH" => 5)
+			end
+
+			it "slurps up to Content-Length bytes from the socket" do
+				@input.read.should == "hello"
+			end
+
+			it "returns the empty string if EOF is reached" do
+				@input.read
+				@input.read.should == ""
+			end
+		end
+
+		context "if Transfer-Encoding is chunked" do
+			before :each do
+				init_input("hello!", "HTTP_TRANSFER_ENCODING" => "chunked")
+			end
+
+			it "slurps the entire socket" do
+				@input.read.should == "hello!"
+			end
+
+			it "returns the empty string if EOF is reached" do
+				@input.read
+				@input.read.should == ""
+			end
+		end
+
+		context "if neither Content-Length nor Transfer-Encoding chunked are given" do
+			before :each do
+				init_input("hello!")
+			end
+
+			it "returns the empty string" do
+				@input.read.should == ""
+			end
+		end
+	end
+
+	describe "with a length argument" do
+		it "raises ArgumentError if len < 0" do
+			init_input("")
+			lambda { @input.read(-1) }.should raise_error(ArgumentError)
+		end
+
+		it "returns the empty string if len == 0" do
+			init_input("hello", "HTTP_TRANSFER_ENCODING" => "chunked")
+			@input.read(0).should == ""
+		end
+
+		context "if Content-Length is given" do
+			before :each do
+				init_input("hello!", "CONTENT_LENGTH" => 5)
+			end
+
+			it "reads exactly len bytes if available" do
+				@input.read(2).should == "he"
+				@input.read(2).should == "ll"
+			end
+
+			it "reads at most Content-Length bytes if Content-Length < len are available" do
+				@input.read(2).should == "he"
+				@input.read(4).should == "llo"
+			end
+
+			it "returns nil if Content-Length is reached" do
+				@input.read(5).should == "hello"
+				@input.read(1).should be_nil
+			end
+		end
+
+		context "if Transfer-Encoding is chunked" do
+			before :each do
+				init_input("hello", "HTTP_TRANSFER_ENCODING" => "chunked")
+			end
+
+			it "reads exactly len bytes if available" do
+				@input.read(2).should == "he"
+				@input.read(2).should == "ll"
+			end
+
+			it "reads until EOF if less than len bytes are available" do
+				@input.read(2).should == "he"
+				@input.read(4).should == "llo"
+			end
+
+			it "returns nil if EOF is reached" do
+				@input.read(5).should == "hello"
+				@input.read(1).should be_nil
+			end
+		end
+
+		context "if neither Content-Length nor Transfer-Encoding chunked are given" do
+			it "returns nil" do
+				init_input("hello")
+				@input.read(2).should be_nil
+			end
+		end
+	end
+end
+
+shared_examples "TeeInput#size" do
+	context "if Content-Length is given" do
+		it "returns the value in Content-Length" do
+			init_input("hello world", "CONTENT_LENGTH" => 10)
+			@input.size.should == 10
+		end
+	end
+
+	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")
+			@input.size.should == 11
+		end
+	end
+
+	context "if neither Content-Length nor Transfer-Encoding chunked are given" do
+		it "returns 0" do
+			init_input("hello world")
+			@input.size.should == 0
+		end
+	end
+end
+
+describe Utils::TeeInput do
+	before :each do
+		@sock, @sock2 = UNIXSocket.pair
+	end
+
+	after :each do
+		[@sock, @sock2].each do |sock|
+			sock.close if sock && !sock.closed?
+		end
+		@input.close if @input
+	end
+
+	context "when unbuffered" do
+		def init_input(data, env = {})
+			@input = Utils::TeeInput.new(@sock2, env)
+			@sock.write(data)
+			@sock.close
+		end
+
+		describe("#gets") { include_examples "TeeInput#gets" }
+		describe("#read") { include_examples "TeeInput#read" }
+		describe("#size") { include_examples "TeeInput#size" }
+	end
+
+	context "when buffered" do
+		def init_input(data, env = {})
+			@input = Utils::TeeInput.new(@sock2, env)
+			@sock.write(data)
+			@sock.close
+			@input.read
+			@input.rewind
+		end
+
+		describe("#gets") { include_examples "TeeInput#gets" }
+		describe("#read") { include_examples "TeeInput#read" }
+		describe("#size") { include_examples "TeeInput#size" }
+	end
+end
+
+end # module PhusionPassenger

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.38
+  version: 4.0.39
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -124,6 +124,7 @@ files:
 - dev/copy_boost_headers.rb
 - dev/find_owner_pipe_leaks.rb
 - dev/install_scripts_bootstrap_code.rb
+- dev/list_tests.rb
 - dev/render_error_pages.rb
 - dev/run_travis.sh
 - dev/runner
@@ -2576,6 +2577,7 @@ files:
 - test/ruby/standalone/runtime_locator_spec.rb
 - test/ruby/utils/file_system_watcher_spec.rb
 - test/ruby/utils/hosts_file_parser.rb
+- test/ruby/utils/tee_input_spec.rb
 - test/ruby/utils/unseekable_socket_spec.rb
 - test/ruby/utils_spec.rb
 - test/stub/.DS_Store
@@ -2938,7 +2940,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: passenger
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A fast and robust web server and application server for Ruby, Python and

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJTHZ8DAAoJECrHRaUKISqMCBkH/2dM97EYCl9cBd0oqVJJU9gj
-w1j01aSvR51w8a5SAMxi+upIggPQ2AGW4bcCDt/MZ9LUgKwWN2FlkHo7I5YhUEt9
-pKrF9AaYdaWAaUwb/s++f0pT7YYJim+ANxmjGiahZBW3Cmbxtgr08JdS/lzKc7sq
-bndmFbAIA/QKAzkK0MiGrz4bD33zmvDlXeNpg2emvwkk9YYGCxMMEfVex13Ob+wY
-xnNn4H9CdLCPL3Yhb1uA/xvhjqWteFthmdkcNvALSrJZ2KySck0kDFOudA0HwDW5
-kLUpZjb7Qusq2bNlKpRZtKr9BPTnyJcUAn32PI0ZL8jmg1JNG+q1MDgDjz4rTQM=
-=toG+
+iQEcBAABAgAGBQJTKAuvAAoJECrHRaUKISqMJV0H/jJ3TdSzvcOED6fM21+rWEUZ
+GwCLToeTuTnXM8kazH/A/+k+Gc1taW3TqdD6Ovu6iJftsrAt+nnfWY23Eo2+X47R
+mwYRWSx1e9nJ+oeiTR/hzo+0swQ+HUR31Fu5sN0dqhptddyEfr6lvvpWY0C71tf9
+o9WL3UP6uZqFJs3fSMW5F+mbC+mqjhJLC1dCzoAq+l18TW6zrkkpFdmhKqQ+z/Q0
+E2u6TyDmIXfyU9proT8Qi/yjV/jhMhFpw19ENAWB1SzFZ/06ZcOy86YqSj4BYScA
+uli9v4gcArgNtDZLE3IogSIQrRQVST7XKhdP0bpZlx5nzkOeWPU+8HS3dK2ZH14=
+=oBMO
 -----END PGP SIGNATURE-----