Better handling of trailers.

Author: ioquatix

async-http.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "io-endpoint", "~> 0.14"
 	spec.add_dependency "io-stream", "~> 0.6"
 	spec.add_dependency "metrics", "~> 0.12"
-	spec.add_dependency "protocol-http", "~> 0.49"
-	spec.add_dependency "protocol-http1", "~> 0.30"
+	spec.add_dependency "protocol-http", "~> 0.58"
+	spec.add_dependency "protocol-http1", "~> 0.36"
 	spec.add_dependency "protocol-http2", "~> 0.22"
 	spec.add_dependency "protocol-url", "~> 0.2"
 	spec.add_dependency "traces", "~> 0.10"

lib/async/http/protocol/http1/client.rb

@@ -32,6 +32,7 @@ def closed(error = nil)
 					def call(request, task: Task.current)
 						# Mark the start of the trailers:
 						trailer = request.headers.trailer!
+						headers = request.headers.header
 
 						# We carefully interpret https://tools.ietf.org/html/rfc7230#section-6.3.1 to implement this correctly.
 						begin
@@ -44,7 +45,7 @@ def call(request, task: Task.current)
 								authority = nil
 							end
 
-							write_request(authority, request.method, target, @version, request.headers)
+							write_request(authority, request.method, target, @version, headers)
 						rescue
 							# If we fail to fully write the request and body, we can retry this request.
 							raise RequestFailed

lib/async/http/protocol/http1/server.rb

@@ -82,12 +82,13 @@ def each(task: Task.current)
 								# If a response was generated, send it:
 								if response
 									trailer = response.headers.trailer!
+									headers = response.headers.header
 
 									# Some operations in this method are long running, that is, it's expected that `body.call(stream)` could literally run indefinitely. In order to facilitate garbage collection, we want to nullify as many local variables before calling the streaming body. This ensures that the garbage collection can clean up as much state as possible during the long running operation, so we don't retain objects that are no longer needed.
 
 									if body and protocol = response.protocol
 										# We force a 101 response if the protocol is upgraded - HTTP/2 CONNECT will return 200 for success, but this won't be understood by HTTP/1 clients:
-										write_response(@version, 101, response.headers)
+										write_response(@version, 101, headers)
 
 										# At this point, the request body is hijacked, so we don't want to call #finish below.
 										request = nil
@@ -100,7 +101,7 @@ def each(task: Task.current)
 										end
 									elsif response.status == 101
 										# This code path is to support legacy behavior where the response status is set to 101, but the protocol is not upgraded. This may not be a valid use case, but it is supported for compatibility. We expect the response headers to contain the `upgrade` header.
-										write_response(@version, response.status, response.headers)
+										write_response(@version, response.status, headers)
 
 										# Same as above:
 										request = nil
@@ -112,7 +113,7 @@ def each(task: Task.current)
 											write_tunnel_body(version, body)
 										end
 									else
-										write_response(@version, response.status, response.headers)
+										write_response(@version, response.status, headers)
 
 										if request.connect? and response.success?
 											# Same as above:

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

@@ -123,7 +123,10 @@ def send_response(response)
 							protocol_headers << [CONTENT_LENGTH, length]
 						end
 
-						headers = ::Protocol::HTTP::Headers::Merged.new(protocol_headers, response.headers)
+						headers = ::Protocol::HTTP::Headers::Merged.new(
+							protocol_headers,
+							response.headers.header
+						)
 
 						if body = response.body and !self.head?
 							# This function informs the headers object that any subsequent headers are going to be trailer. Therefore, it must be called *before* sending the headers, to avoid any race conditions.

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

@@ -221,7 +221,7 @@ def send_request(request)
 
 						headers = ::Protocol::HTTP::Headers::Merged.new(
 							pseudo_headers,
-							request.headers
+							request.headers.header
 						)
 
 						if request.body.nil?

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

@@ -36,21 +36,21 @@ def initialize(*)
 
 					attr :input
 
-					def add_header(key, value)
+					def add_header(key, value, trailer: false)
 						if key == CONNECTION
 							raise ::Protocol::HTTP2::HeaderError, "Connection header is not allowed!"
 						elsif key.start_with? ":"
 							raise ::Protocol::HTTP2::HeaderError, "Invalid pseudo-header #{key}!"
 						elsif key =~ /[A-Z]/
 							raise ::Protocol::HTTP2::HeaderError, "Invalid upper-case characters in header #{key}!"
 						else
-							@headers.add(key, value)
+							@headers.add(key, value, trailer: trailer)
 						end
 					end
 
 					def receive_trailing_headers(headers, end_stream)
 						headers.each do |key, value|
-							add_header(key, value)
+							add_header(key, value, trailer: true)
 						end
 					end
 

releases.md

@@ -1,5 +1,9 @@
 # Releases
 
+## Unreleased
+
+  - Better handling of trailers.
+
 ## v0.92.0
 
   - **Breaking**: Remove `Async::HTTP::Reference`. Use `Protocol::URL::Reference` directly instead.