Rename keep_alive to persistent. Add a request/response count.

Author: ioquatix

lib/async/http/protocol/http10.rb

@@ -31,7 +31,7 @@ def version
 					VERSION
 				end
 
-				def keep_alive?(headers)
+				def persistent?(headers)
 					headers['connection'] == KEEP_ALIVE
 				end
 
@@ -44,7 +44,7 @@ def receive_requests
 
 						write_response(response.version, response.status, response.headers, response.body)
 
-						unless keep_alive?(request.headers) && keep_alive?(headers)
+						unless persistent?(request.headers) && persistent?(headers)
 							@keep_alive = false
 
 							break
@@ -54,9 +54,9 @@ def receive_requests
 					return false
 				end
 
-				def write_body(body, chunked = true)
+				def write_body(body, chunked = false)
 					# We don't support chunked encoding.
-					super(body, false)
+					super(body, chunked)
 				end
 
 				def read_body(headers)
@@ -65,7 +65,7 @@ def read_body(headers)
 					end
 
 					# Technically, with HTTP/1.0, if no content-length is specified, we just need to read everything until the connection is closed.
-					if !keep_alive?(headers)
+					if !persistent?(headers)
 						return Body::Remainder.new(@stream)
 					end
 				end

lib/async/http/protocol/http11.rb

@@ -36,16 +36,19 @@ class HTTP11 < Async::IO::Protocol::Line
 				def initialize(stream)
 					super(stream, CRLF)
 
-					@keep_alive = true
+					@persistent = true
+					@count = 0
 				end
 
+				attr :count
+				
 				# Only one simultaneous connection at a time.
 				def multiplex
 					1
 				end
 
 				def reusable?
-					@keep_alive
+					@persistent
 				end
 
 				class << self
@@ -62,14 +65,15 @@ def version
 					VERSION
 				end
 
-				def keep_alive?(headers)
+				def persistent?(headers)
 					headers['connection'] != CLOSE
 				end
 
 				# Server loop.
 				def receive_requests(task: Task.current)
 					while true
 						request = Request.new(*read_request)
+						@count += 1
 
 						response = yield request
 
@@ -79,8 +83,8 @@ def receive_requests(task: Task.current)
 
 						request.finish
 
-						unless keep_alive?(request.headers) and keep_alive?(response.headers)
-							@keep_alive = false
+						unless persistent?(request.headers) and persistent?(response.headers)
+							@persistent = false
 
 							break
 						end
@@ -91,13 +95,16 @@ def receive_requests(task: Task.current)
 				end
 
 				def call(request)
+					@count += 1
+					
 					request.version ||= self.version
 
 					Async.logger.debug(self) {"#{request.method} #{request.path} #{request.headers.inspect}"}
 					write_request(request.authority, request.method, request.path, request.version, request.headers, request.body)
 
 					return Response.new(*read_response)
 				rescue EOFError
+					Async.logger.debug(self) {"Connection failed with EOFError after #{@count} requests."}
 					return nil
 				end
 
@@ -118,7 +125,7 @@ def read_response
 					headers = read_headers
 					body = read_body(headers)
 
-					@keep_alive = keep_alive?(headers)
+					@keep_alive = persistent?(headers)
 
 					return version, Integer(status), reason, headers, body
 				end
@@ -163,7 +170,7 @@ def read_headers(headers = {})
 				end
 
 				def write_body(body, chunked = true)
-					if body.empty?
+					if body.nil? or body.empty?
 						@stream.write("Content-Length: 0\r\n\r\n")
 						body.read
 					elsif chunked

lib/async/http/protocol/http2.rb

@@ -64,8 +64,12 @@ def initialize(controller, stream)
 					@controller.on(:frame_received) do |frame|
 						Async.logger.debug(self) {"Received frame: #{frame.inspect}"}
 					end
+					
+					@count = 0
 				end
 
+				attr :count
+				
 				# Multiple requests can be processed at the same time.
 				def multiplex
 					@controller.remote_settings[:settings_max_concurrent_streams]
@@ -106,6 +110,8 @@ def close
 				def receive_requests(task: Task.current, &block)
 					# emits new streams opened by the client
 					@controller.on(:stream) do |stream|
+						@count += 1
+						
 						request = Request.new
 						request.version = self.version
 						request.headers = {}
@@ -145,7 +151,7 @@ def receive_requests(task: Task.current, &block)
 							headers.update(response.headers)
 
 							# puts "Sending headers #{headers}"
-							if response.body.empty?
+							if response.body.nil? or response.body.empty?
 								stream.headers(headers, end_stream: true)
 								response.body.read
 							else
@@ -168,6 +174,8 @@ def receive_requests(task: Task.current, &block)
 				end
 
 				def call(request)
+					@count += 1
+					
 					request.version ||= self.version
 
 					stream = @controller.new_stream