passenger 4.0.37 → 4.0.38

data/lib/phusion_passenger/standalone/start_command.rb

@@ -374,9 +374,9 @@ private
 			end
 		end
 	else
-		def check_port(address, port)
+		def check_port_with_protocol(address, port, protocol)
 			begin
-				socket = Socket.new(Socket::Constants::AF_INET, Socket::Constants::SOCK_STREAM, 0)
+				socket = Socket.new(protocol, Socket::Constants::SOCK_STREAM, 0)
 				sockaddr = Socket.pack_sockaddr_in(port, address)
 				begin
 					socket.connect_nonblock(sockaddr)
@@ -403,6 +403,14 @@ private
 				socket.close if socket && !socket.closed?
 			end
 		end
+
+		def check_port(address, port)
+			begin
+				check_port_with_protocol(address, port, Socket::Constants::AF_INET)
+			rescue Errno::EAFNOSUPPORT
+				check_port_with_protocol(address, port, Socket::Constants::AF_INET6)
+			end
+		end
 	end
 
 	def check_port_availability
@@ -435,9 +443,11 @@ private
 			else
 				scheme = "http"
 			end
-			result = "#{scheme}://#{@options[:address]}"
-			if @options[:port] != 80
-				result << ":#{@options[:port]}"
+			result = "#{scheme}://"
+			if @options[:port] == 80
+				result << @options[:address]
+			else
+				result << compose_ip_and_port(@options[:address], @options[:port])
 			end
 			result << "/"
 			return result
@@ -695,7 +705,7 @@ private
 			else
 				port = options[:port]
 			end
-			return "#{options[:address]}:#{port}"
+			return compose_ip_and_port(options[:address], port)
 		end
 	end
 
@@ -703,7 +713,16 @@ private
 		if options[:socket_file]
 			return "unix:" + File.expand_path(options[:socket_file])
 		else
-			return "#{options[:address]}:#{options[:ssl_port]}"
+			return compose_ip_and_port(options[:address], options[:ssl_port])
+		end
+	end
+
+	def compose_ip_and_port(ip, port)
+		if ip =~ /:/
+			# IPv6
+			return "[#{ip}]:#{port}"
+		else
+			return "#{ip}:#{port}"
 		end
 	end
 

data/lib/phusion_passenger/utils/terminal_choice_menu.rb

@@ -54,7 +54,6 @@ class TerminalChoiceMenu
 		@choices = choices.map { |choice| Choice.create(choice) }
 		@pointer = 0
 		@index   = index_choices
-		initialize_terminal_control
 	end
 
 	def display_choices
@@ -187,27 +186,22 @@ private
 		require 'readline'
 		java_import 'jline.console.ConsoleReader'
 
-		def initialize_terminal_control
+		def raw_no_echo_mode
 			input = STDIN.to_inputstream
 			output = STDOUT.to_outputstream
 			@console = ConsoleReader.new(input, output)
 			@console.set_history_enabled(false)
 			@console.set_bell_enabled(true)
 			@console.set_pagination_enabled(false)
-		end
-
-		def raw_no_echo_mode
 			@terminal_state = @console.getEchoCharacter
-            @console.setEchoCharacter(0)
+			@console.setEchoCharacter(0)
 		end
 
 		def restore_mode
 			@console.setEchoCharacter(@terminal_state)
+			@console.get_terminal.restore
 		end
 	else
-		def initialize_terminal_control
-		end
-
 		def raw_no_echo_mode
 			@terminal_state = `stty -g`
 			system("stty raw -echo -icanon isig")

data/lib/phusion_passenger/utils/tmpio.rb

@@ -12,14 +12,25 @@ class TmpIO < File
   # creates and returns a new File object.  The File is unlinked
   # immediately, switched to binary mode, and userspace output
   # buffering is disabled
-  def self.new(namespace)
+  def self.new(namespace, options = nil)
+    if options
+      mode   = options[:mode] || RDWR
+      binary = options.fetch(:binary, true)
+      suffix = options[:suffix]
+      unlink_immediately = options.fetch(:unlink_immediately, true)
+    else
+      mode   = RDWR
+      binary = true
+      suffix = nil
+      unlink_immediately = true
+    end
     fp = begin
-      super("#{Dir::tmpdir}/#{namespace}-#{rand}", RDWR|CREAT|EXCL, 0600)
+      super("#{Dir::tmpdir}/#{namespace}-#{rand(0x100000000).to_s(36)}#{suffix}", mode | CREAT | EXCL, 0600)
     rescue Errno::EEXIST
       retry
     end
-    unlink(fp.path)
-    fp.binmode
+    unlink(fp.path) if unlink_immediately
+    fp.binmode if binary
     fp.sync = true
     fp
   end

data/passenger.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 	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'
+	s.add_dependency 'daemon_controller', '>= 1.2.0'
 	s.add_dependency 'rack'
 	s.files = Dir[*PhusionPassenger::Packaging::GLOB] -
 		Dir[*PhusionPassenger::Packaging::EXCLUDE_GLOB]

data/test/integration_tests/apache2_tests.rb

@@ -291,6 +291,12 @@ describe "Apache 2 module" do
 				vhost << "PassengerAppRoot #{@mycook2.full_app_root}"
 			end
 
+			@stub = RackStub.new('rack')
+			@stub_url_root = "http://5.passenger.test:#{@apache2.port}"
+			@apache2.set_vhost('5.passenger.test', "#{@stub.full_app_root}/public") do |vhost|
+				vhost << "PassengerBufferUpload off"
+			end
+
 			@apache2.start
 		end
 
@@ -298,6 +304,7 @@ describe "Apache 2 module" do
 			@mycook.destroy
 			@foobar.destroy
 			@mycook2.destroy
+			@stub.destroy
 			@apache2.stop if @apache2
 		end
 
@@ -305,6 +312,7 @@ describe "Apache 2 module" do
 			@mycook.reset
 			@foobar.reset
 			@mycook2.reset
+			@stub.reset
 		end
 
 		specify "RailsEnv is per-virtual host" do
@@ -386,6 +394,32 @@ describe "Apache 2 module" do
 			get('/welcome/show_id/foo%2fbar').should == 'foo/bar'
 		end
 
+		describe "when handling POST requests with 'chunked' transfer encoding, if PassengerBufferUpload is off" do
+			it "sets Transfer-Encoding to 'chunked' and removes Content-Length" do
+				@uri = URI.parse(@stub_url_root)
+				socket = TCPSocket.new(@uri.host, @uri.port)
+				begin
+					socket.write("POST #{@stub_url_root}/env HTTP/1.1\r\n")
+					socket.write("Host: #{@uri.host}:#{@uri.port}\r\n")
+					socket.write("Transfer-Encoding: chunked\r\n")
+					socket.write("Content-Type: text/plain\r\n")
+					socket.write("Connection: close\r\n")
+					socket.write("\r\n")
+
+					chunk = "foo=bar!"
+					socket.write("%X\r\n%s\r\n" % [chunk.size, chunk])
+					socket.write("0\r\n\r\n")
+					socket.flush
+
+					response = socket.read
+					response.should_not include("CONTENT_LENGTH = ")
+					response.should include("HTTP_TRANSFER_ENCODING = chunked\n")
+				ensure
+					socket.close
+				end
+			end
+		end
+
 		####################################
 	end
 

data/test/integration_tests/shared/example_webapp_tests.rb

@@ -72,29 +72,57 @@ shared_examples_for "an example web app" do
 		end
 	end
 
-	it "properly handles POST requests with 'chunked' transfer encoding" do
-		uri = URI.parse(@server)
-		socket = TCPSocket.new(uri.host, uri.port)
-		begin
-			socket.write("POST #{base_uri}/raw_upload_to_file HTTP/1.1\r\n")
-			socket.write("Host: #{uri.host}:#{uri.port}\r\n")
-			socket.write("Transfer-Encoding: chunked\r\n")
-			socket.write("Content-Type: text/plain\r\n")
-			socket.write("Connection: close\r\n")
-			socket.write("X-Output: output.txt\r\n")
-			socket.write("\r\n")
+	describe "when handling POST requests with 'chunked' transfer encoding" do
+		before :each do
+			@uri = URI.parse(@server)
+		end
 
-			chunk = "foo=bar!"
-			socket.write("%X\r\n%s\r\n" % [chunk.size, chunk])
-			socket.write("0\r\n\r\n")
-			socket.flush
+		it "dechunks the request body for the app" do
+			socket = TCPSocket.new(@uri.host, @uri.port)
+			begin
+				socket.write("POST #{base_uri}/raw_upload_to_file HTTP/1.1\r\n")
+				socket.write("Host: #{@uri.host}:#{@uri.port}\r\n")
+				socket.write("Transfer-Encoding: chunked\r\n")
+				socket.write("Content-Type: text/plain\r\n")
+				socket.write("Connection: close\r\n")
+				socket.write("X-Output: output.txt\r\n")
+				socket.write("\r\n")
 
-			socket.read.should =~ /\r\nok\Z/
-		ensure
-			socket.close
+				chunk = "foo=bar!"
+				socket.write("%X\r\n%s\r\n" % [chunk.size, chunk])
+				socket.write("0\r\n\r\n")
+				socket.flush
+
+				socket.read.should =~ /\r\nok\Z/
+			ensure
+				socket.close
+			end
+
+			File.read(@stub.full_app_root + "/output.txt").should == "foo=bar!"
 		end
 
-		File.read(@stub.full_app_root + "/output.txt").should == "foo=bar!"
+		it "sets Content-Length and removes Transfer-Encoding in the request" do
+			socket = TCPSocket.new(@uri.host, @uri.port)
+			begin
+				socket.write("POST #{base_uri}/env HTTP/1.1\r\n")
+				socket.write("Host: #{@uri.host}:#{@uri.port}\r\n")
+				socket.write("Transfer-Encoding: chunked\r\n")
+				socket.write("Content-Type: text/plain\r\n")
+				socket.write("Connection: close\r\n")
+				socket.write("\r\n")
+
+				chunk = "foo=bar!"
+				socket.write("%X\r\n%s\r\n" % [chunk.size, chunk])
+				socket.write("0\r\n\r\n")
+				socket.flush
+
+				response = socket.read
+				response.should include("CONTENT_LENGTH = 8\n")
+				response.should_not include("HTTP_TRANSFER_ENCODING = ")
+			ensure
+				socket.close
+			end
+		end
 	end
 
 	it "supports responses with the 'chunked' transfer encoding" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.37
+  version: 4.0.38
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -68,11 +68,11 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG
 - CONTRIBUTING.md
 - CONTRIBUTORS
 - INSTALL.md
 - LICENSE
-- NEWS
 - README.md
 - Rakefile
 - bin/passenger

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJS6CPHAAoJECrHRaUKISqMVE8IAJ1rJonGDQ1UC7Yvb15ee0rP
-GfZ/TfGnc/4QhQPiurKmZedvNR8J2jX1rpHDZ608V5x2/ob6XRu4JjWNsfQa9dg2
-cj5voVZEVJzEQEPVfqAGxFxWGoAB/Y0sOMV+gm6ApPYVLrx7E+Z9zrA4MPD+Cg21
-3BDA85scuJVJbzE/83m3DfmqcdNnyLga4jXRJ5BoiFgsDmbK672nrKB/1z/rMlK9
-JPXtWWAIvMb4W28VSQ9khqAkMkqzn+QoBU0IamaTc9uguktnCdvkMoy8tI2ximYB
-Vsl1e3/nNIcGpUhIoe55se9D4d242c4sge0RlFWbnkTnfqCRkos/Sn6l+yn8HkU=
-=aUm3
+iQEcBAABAgAGBQJTHZ8DAAoJECrHRaUKISqMCBkH/2dM97EYCl9cBd0oqVJJU9gj
+w1j01aSvR51w8a5SAMxi+upIggPQ2AGW4bcCDt/MZ9LUgKwWN2FlkHo7I5YhUEt9
+pKrF9AaYdaWAaUwb/s++f0pT7YYJim+ANxmjGiahZBW3Cmbxtgr08JdS/lzKc7sq
+bndmFbAIA/QKAzkK0MiGrz4bD33zmvDlXeNpg2emvwkk9YYGCxMMEfVex13Ob+wY
+xnNn4H9CdLCPL3Yhb1uA/xvhjqWteFthmdkcNvALSrJZ2KySck0kDFOudA0HwDW5
+kLUpZjb7Qusq2bNlKpRZtKr9BPTnyJcUAn32PI0ZL8jmg1JNG+q1MDgDjz4rTQM=
+=toG+
 -----END PGP SIGNATURE-----