async-http 0.50.13 → 0.51.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cecbbc1a65dc4e0697fab222184c9a310bdaccfb5673f2200c3686f77ab7b9e
-  data.tar.gz: 88a4d5a5b7c10f48033f78ac838c0b75d969f85a33e9ccca07bd0f587865d8ab
+  metadata.gz: 62fe3621934ee594b2c2d2b2056208a4298b6df2f1f9f831560df9d14263d220
+  data.tar.gz: d6af75111b6085d3c7df5643290486a81b2c99b69506310b80849f44fbaec24a
 SHA512:
-  metadata.gz: 9f1bb76e135ec8d00508c5c1625d017e79ba87a19552ea4968b3a206f65fb3702623b2f1d96f80a88948ccbf959e3aac8a959dcc5c86a3cd65cd9159a9b6ac15
-  data.tar.gz: b8ea5b50c9a4b76ddf9cd21484eba947674c590410e7335b10c24823997fa9d9c7235e160ee9d804905083e31ee51dca83faea02265421734da35227a9bf7bb0
+  metadata.gz: 60b2c696a4396dd5058413436666b37acf112eeda5da8c66c7182285e6587478869b90850a2328115146e2008ac9008c526a08c519a6f74b1167f5390c82246f
+  data.tar.gz: af80653e3cb7e9619b56b7d40a098b252ae1749b0c1a2a1d733d85204492c73d274f604484e6de5703c0c9e3278a34b94ffc338478b38d9b5a4db21619b77204

data/async-http.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
 	spec.add_dependency("async-io", "~> 1.28")
 	spec.add_dependency("async-pool", "~> 0.2")
 	
-	spec.add_dependency("protocol-http", "~> 0.17.0")
-	spec.add_dependency("protocol-http1", "~> 0.11.0")
+	spec.add_dependency("protocol-http", "~> 0.18.0")
+	spec.add_dependency("protocol-http1", "~> 0.12.0")
 	spec.add_dependency("protocol-http2", "~> 0.13.0")
 	
 	# spec.add_dependency("openssl")

data/lib/async/http/client.rb

@@ -121,7 +121,7 @@ module Async
 					else
 						raise
 					end
-				rescue IOError, EOFError, Errno::ECONNRESET, Errno::EPIPE
+				rescue SocketError, IOError, EOFError, Errno::ECONNRESET, Errno::EPIPE
 					if connection
 						@pool.release(connection)
 						connection = nil

data/lib/async/http/internet.rb

@@ -33,7 +33,7 @@ module Async
 				@options = options
 			end
 			
-			def call(method, url, headers = [], body = nil)
+			def call(method, url, headers = nil, body = nil)
 				endpoint = Endpoint.parse(url)
 				key = host_key(endpoint)
 				
@@ -42,6 +42,7 @@ module Async
 				end
 				
 				body = Body::Buffered.wrap(body)
+				headers = ::Protocol::HTTP::Headers[headers]
 				
 				request = ::Protocol::HTTP::Request.new(client.scheme, endpoint.authority, method, endpoint.path, nil, headers, body)
 				
@@ -58,7 +59,7 @@ module Async
 			end
 			
 			::Protocol::HTTP::Methods.each do |name, verb|
-				define_method(verb.downcase) do |url, headers = [], body = nil|
+				define_method(verb.downcase) do |url, headers = nil, body = nil|
 					self.call(verb, url.to_str, headers, body)
 				end
 			end

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

@@ -31,6 +31,8 @@ module Async
 					def call(request, task: Task.current)
 						Async.logger.debug(self) {"#{request.method} #{request.path} #{request.headers.inspect}"}
 						
+						trailers = request.headers.trailers!
+						
 						# We carefully interpret https://tools.ietf.org/html/rfc7230#section-6.3.1 to implement this correctly.
 						begin
 							write_request(request.authority, request.method, request.path, @version, request.headers)
@@ -39,8 +41,6 @@ module Async
 							raise RequestFailed
 						end
 						
-						request.headers.trailers!
-						
 						if request.body?
 							body = request.body
 							
@@ -63,7 +63,7 @@ module Async
 									subtask.annotate("Streaming body.")
 									
 									# Once we start writing the body, we can't recover if the request fails. That's because the body might be generated dynamically, streaming, etc.
-									write_body(@version, body, false, request.trailers)
+									write_body(@version, body, false, trailers)
 								end
 							end
 						elsif protocol = request.protocol

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

@@ -60,8 +60,9 @@ module Async
 							return if @stream.nil? or @stream.closed?
 							
 							if response
+								trailers = response.headers.trailers!
+								
 								write_response(@version, response.status, response.headers)
-								response.headers.trailers!
 								
 								body = response.body
 								
@@ -85,7 +86,6 @@ module Async
 									body.call(stream)
 								else
 									head = request.head?
-									trailers = response.trailers
 									
 									request = nil unless body
 									response = nil

data/lib/async/http/protocol/http2/connection.rb

@@ -101,7 +101,7 @@ module Async
 									self.consume_window
 									self.read_frame
 								end
-							rescue IOError, EOFError, Errno::ECONNRESET, Errno::EPIPE, Async::Wrapper::Cancelled
+							rescue SocketError, IOError, EOFError, Errno::ECONNRESET, Errno::EPIPE, Async::Wrapper::Cancelled
 								# Ignore.
 							ensure
 								# Don't call #close twice.

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

@@ -183,8 +183,12 @@ module Async
 						headers = ::Protocol::HTTP::Headers::Merged.new(protocol_headers, response.headers)
 						
 						if body = response.body and !self.head?
+							# This function informs the headers object that any subsequent headers are going to be trailers. Therefore, it must be called *before* sending the headers, to avoid any race conditions.
+							trailers = response.headers.trailers!
+							
 							@stream.send_headers(nil, headers)
-							@stream.send_body(body, response.trailers)
+							
+							@stream.send_body(body, trailers)
 						else
 							# Ensure the response body is closed if we are ending the stream:
 							response.close

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

@@ -215,13 +215,16 @@ module Async
 						if request.body.nil?
 							@stream.send_headers(nil, headers, ::Protocol::HTTP2::END_STREAM)
 						else
+							# This function informs the headers object that any subsequent headers are going to be trailers. Therefore, it must be called *before* sending the headers, to avoid any race conditions.
+							trailers = request.headers.trailers!
+							
 							begin
 								@stream.send_headers(nil, headers)
 							rescue
 								raise RequestFailed
 							end
 							
-							@stream.send_body(request.body, request.trailers)
+							@stream.send_body(request.body, trailers)
 						end
 					end
 				end

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

@@ -61,8 +61,6 @@ module Async
 					end
 					
 					def receive_trailing_headers(headers, end_stream)
-						@headers.trailers!
-						
 						headers.each do |key, value|
 							if @trailers.include?(key)
 								add_header(key, value)
@@ -76,6 +74,7 @@ module Async
 						if @headers.nil?
 							@headers = ::Protocol::HTTP::Headers.new
 							self.receive_initial_headers(super, frame.end_stream?)
+							
 							@trailers = @headers[TRAILERS]
 						elsif @trailers and frame.end_stream?
 							self.receive_trailing_headers(super, frame.end_stream?)

data/lib/async/http/proxy.rb

@@ -31,18 +31,18 @@ module Async
 		# Behaves like a TCP endpoint for the purposes of connecting to a remote host.
 		class Proxy
 			module Client
-				def proxy(endpoint, headers = [])
+				def proxy(endpoint, headers = nil)
 					Proxy.new(self, endpoint.authority(false), headers)
 				end
 				
 				# Create a client that will proxy requests through the current client.
-				def proxied_client(endpoint, headers = [])
+				def proxied_client(endpoint, headers = nil)
 					proxy = self.proxy(endpoint, headers)
 					
 					return self.class.new(proxy.wrap_endpoint(endpoint))
 				end
 				
-				def proxied_endpoint(endpoint, headers = [])
+				def proxied_endpoint(endpoint, headers = nil)
 					proxy = self.proxy(endpoint, headers)
 					
 					return proxy.wrap_endpoint(endpoint)
@@ -55,7 +55,7 @@ module Async
 			# @param port [String] the port number to connect to.
 			# @param headers [Array] an optional list of headers to use when establishing the connection.
 			# @see Async::IO::Endpoint#tcp
-			def self.tcp(client, host, port, headers = [])
+			def self.tcp(client, host, port, headers = nil)
 				self.new(client, "#{host}:#{port}", headers)
 			end
 			
@@ -63,7 +63,7 @@ module Async
 			# @param client [Async::HTTP::Client] the client which will be used as a proxy server.
 			# @param endpoint [Async::HTTP::Endpoint] the endpoint to connect to.
 			# @param headers [Array] an optional list of headers to use when establishing the connection.
-			def self.endpoint(client, endpoint, headers = [])
+			def self.endpoint(client, endpoint, headers = nil)
 				proxy = self.new(client, endpoint.authority(false), headers)
 				
 				return proxy.endpoint(endpoint.url)
@@ -72,10 +72,10 @@ module Async
 			# @param client [Async::HTTP::Client] the client which will be used as a proxy server.
 			# @param address [String] the address to connect to.
 			# @param headers [Array] an optional list of headers to use when establishing the connection.
-			def initialize(client, address, headers = [])
+			def initialize(client, address, headers = nil)
 				@client = client
 				@address = address
-				@headers = headers
+				@headers = ::Protocol::HTTP::Headers[headers].freeze
 			end
 			
 			attr :client

data/lib/async/http/version.rb

@@ -22,6 +22,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.50.13"
+		VERSION = "0.51.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.50.13
+  version: 0.51.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-07 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: protocol-http1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: protocol-http2
   requirement: !ruby/object:Gem::Requirement