Improve body handling, especially HEAD requests.

Author: ioquatix

async-http.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 	spec.add_dependency("async-io", "~> 1.27.0")
 	spec.add_dependency("async-pool", "~> 0.2")
 
-	spec.add_dependency("protocol-http", "~> 0.14.1")
+	spec.add_dependency("protocol-http", "~> 0.15.1")
 	spec.add_dependency("protocol-http1", "~> 0.10.0")
 	spec.add_dependency("protocol-http2", "~> 0.11.0")
 

lib/async/http/protocol/http2/request.rb

@@ -165,36 +165,31 @@ def push(path, headers = nil, scheme = @scheme, authority = @authority)
 
 					def send_response(response)
 						if response.nil?
-							@stream.send_headers(nil, NO_RESPONSE, ::Protocol::HTTP2::END_STREAM)
-						elsif response.body? && !self.head?
-							pseudo_headers = [
-								[STATUS, response.status],
-							]
-							
-							if protocol = response.protocol
-								pseudo_headers << [PROTOCOL, protocol]
-							end
-							
-							if length = response.body.length
-								pseudo_headers << [CONTENT_LENGTH, length]
-							end
-							
-							headers = ::Protocol::HTTP::Headers::Merged.new(
-								pseudo_headers,
-								response.headers
-							)
-							
+							return @stream.send_headers(nil, NO_RESPONSE, ::Protocol::HTTP2::END_STREAM)
+						end
+						
+						protocol_headers = [
+							[STATUS, response.status],
+						]
+						
+						if protocol = response.protocol
+							protocol_headers << [PROTOCOL, protocol]
+						end
+						
+						if length = response.body&.length
+							protocol_headers << [CONTENT_LENGTH, length]
+						end
+						
+						headers = ::Protocol::HTTP::Headers::Merged.new(protocol_headers, response.headers)
+						
+						if body = response.body and !self.head?
 							@stream.send_headers(nil, headers)
-							@stream.send_body(response.body)
+							@stream.send_body(body)
 						else
-							headers = ::Protocol::HTTP::Headers::Merged.new([
-								[STATUS, response.status],
-							], response.headers)
+							# Ensure the response body is closed if we are ending the stream:
+							response.close
 
 							@stream.send_headers(nil, headers, ::Protocol::HTTP2::END_STREAM)
-							
-							# If the response had a body but it was not sent, close it (e.g. HEAD request).
-							response.body&.close
 						end
 					end
 				end

lib/async/http/protocol/http2/response.rb

@@ -75,13 +75,15 @@ def receive_initial_headers(headers, end_stream)
 
 							@response.headers = @headers
 
-							unless @response.valid?
-								send_reset_stream(::Protocol::HTTP2::Error::PROTOCOL_ERROR)
-							else
-								# We only construct the input/body if data is coming.
-								unless end_stream
+							if @response.valid?
+								if !end_stream
+									# We only construct the input/body if data is coming.
 									@response.body = prepare_input(@length)
+								elsif @response.head?
+									@response.body = ::Protocol::HTTP::Body::Head.new(@length)
 								end
+							else
+								send_reset_stream(::Protocol::HTTP2::Error::PROTOCOL_ERROR)
 							end
 
 							self.notify!
@@ -140,6 +142,10 @@ def wait
 						@stream.wait
 					end
 
+					def head?
+						@request&.head?
+					end
+					
 					def valid?
 						!!@status
 					end

lib/async/http/protocol/http2/stream.rb

@@ -34,6 +34,7 @@ def initialize(stream, length)
 							super(length)
 
 							@stream = stream
+							@remaining = length
 						end
 
 						def read
@@ -42,6 +43,17 @@ def read
 								@stream.request_window_update
 							end
 
+							# We track the expected length and check we got what we were expecting.
+							if @remaining
+								if chunk
+									@remaining -= chunk.bytesize
+								elsif @remaining > 0
+									raise EOFError, "Expected #{self.length} bytes, #{@remaining} bytes short!"
+								elsif @remaining < 0
+									raise EOFError, "Expected #{self.length} bytes, #{@remaining} bytes over!"
+								end
+							end
+							
 							return chunk
 						end
 					end

spec/async/http/protocol/http11_spec.rb

@@ -39,7 +39,8 @@
 
 				expect(response).to be_success
 				expect(response.version).to be == "HTTP/1.1"
-				expect(response.body).to be nil
+				expect(response.body).to be_empty
+				
 				response.read
 			end
 		end

spec/async/http/protocol/shared_examples.rb

@@ -86,7 +86,7 @@
 		end
 	end
 
-	context 'working server' do
+	context 'with working server' do
 		let(:server) do
 			Async::HTTP::Server.for(endpoint, protocol) do |request|
 				if request.method == 'POST'
@@ -108,7 +108,7 @@
 			expect(server.scheme).to be == "http"
 		end
 
-		context 'GET' do
+		context 'using GET method' do
 			let(:expected) {"GET #{protocol::VERSION}"}
 
 			context 'with response' do
@@ -124,6 +124,10 @@
 					expect(response.read).to eq expected
 				end
 
+				it "provides content length" do
+					expect(response.body.length).to_not be_nil
+				end
+				
 				let(:tempfile) {Tempfile.new}
 
 				it "can save to disk" do
@@ -170,7 +174,9 @@
 
 			it "is successful and without body" do
 				expect(response).to be_success
-				expect(response.body).to be_nil
+				expect(response.body).to_not be_nil
+				expect(response.body).to be_empty
+				expect(response.body.length).to_not be_nil
 				expect(response.read).to be_nil
 			end
 		end