Fix RequestHandler unit tests

FooBarWidget · FooBarWidget · commit 434e88894f21 · 2012-08-30T00:38:28.000+02:00
diff --git a/lib/phusion_passenger/request_handler.rb b/lib/phusion_passenger/request_handler.rb
@@ -112,6 +112,7 @@ def initialize(owner_pipe, options = {})
 			"analytics_logger",
 			"pool_account_username"
 		)
+		@thread_handler = options["thread_handler"] || ThreadHandler
 		@concurrency = 1
 		@memory_limit = options["memory_limit"] || 0
 		if options["pool_account_password_base64"]
@@ -415,16 +416,18 @@ def start_threads
 			:server_socket => @http_socket,
 			:socket_name => "HTTP socket",
 			:protocol => :http,
-			:app_group_name => @app_group_name
+			:app_group_name => @app_group_name,
+			:connect_password => @connect_password
 		}
 
+		thread_handler = @thread_handler
 		@threads_mutex.synchronize do
 			@concurrency.times do |i|
 				thread = Thread.new(i) do |number|
 					Thread.current.abort_on_exception = true
 					begin
 						Thread.current[:name] = "Worker #{number + 1}"
-						handler = ThreadHandler.new(self, main_socket_options)
+						handler = thread_handler.new(self, main_socket_options)
 						handler.install
 						handler.main_loop
 					ensure
@@ -438,7 +441,7 @@ def start_threads
 				Thread.current.abort_on_exception = true
 				begin
 					Thread.current[:name] = "HTTP helper worker"
-					handler = ThreadHandler.new(self, http_socket_options)
+					handler = thread_handler.new(self, http_socket_options)
 					handler.install
 					handler.main_loop
 				ensure
diff --git a/lib/phusion_passenger/request_handler/thread_handler.rb b/lib/phusion_passenger/request_handler/thread_handler.rb
@@ -197,7 +197,7 @@ def parse_http_request(connection, channel, buffer)
 		
 		data = ""
 		while data !~ /\r\n\r\n/ && data.size < MAX_HEADER_SIZE
-			data << socket.readpartial(16 * 1024)
+			data << connection.readpartial(16 * 1024)
 		end
 		if data.size >= MAX_HEADER_SIZE
 			warn("*** Passenger RequestHandler warning: " <<
@@ -220,7 +220,7 @@ def parse_http_request(connection, channel, buffer)
 				headers["SCRIPT_NAME"]     = ""
 				headers["PATH_INFO"]       = path_info
 				headers["SERVER_NAME"]     = "127.0.0.1"
-				headers["SERVER_PORT"]     = socket.addr[1].to_s
+				headers["SERVER_PORT"]     = connection.addr[1].to_s
 				headers["SERVER_PROTOCOL"] = protocol
 			else
 				header, value = line.split(/\s*:\s*/, 2)
diff --git a/test/ruby/abstract_request_handler_spec.rb b/test/ruby/abstract_request_handler_spec.rb
