async-http 0.30.2 → 0.30.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a937910aa49ee7d30c1941ac83a39f4f5ba2c5c52beec347b510dffd0ac2b40e
-  data.tar.gz: 62e34957a999e3e83636f2c00e6f9b6227264f1a7c0d00e69048bf7ff9ceab88
+  metadata.gz: 063a701b5810c3425ab42fef84e971b8f0c916c0b4ad55cf305b5385850cc6de
+  data.tar.gz: 32daee0cf2ca5a488e6e33308a1b7c9f953feafed4111d1e82b6212790570d6c
 SHA512:
-  metadata.gz: 5256304facd1f375f6d668b10361d89262d5c367f50eff8d0c9f5c3d8ab6374a70c51a28997357b45bad40d4bb569d7daf3d7fb2a527a88735a8a10083abe2dc
-  data.tar.gz: c91d8eef348500108f6186bd80ba79eaaac72af42153f7a00fbb4ea05b6db91196b7b421755fe754e8ae6d05b2c560d6e2d49c172447cd2cbeb8dcd84fc77db8
+  metadata.gz: '089514e5e4d794709be2fa407fd8dba4b39e8a3ac309591a238737ad0b267e84c2be525bb6532981c0844a226f6ec5a3433b717bae74e4eb95b10117f0264ec3'
+  data.tar.gz: d96035f10d063da6ce0f16086aaa67baaabdd5aec2c733ec8b770af7012bf9b3992060b704e6b8b62f129ef26b92cf246cec1d447386b54cb3bb7cb9c0f81a5d

data/async-http.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 	spec.add_dependency("async", "~> 1.6")
 	spec.add_dependency("async-io", "~> 1.15")
 	
-	spec.add_dependency("http-protocol", "~> 0.2.0")
+	spec.add_dependency("http-protocol", "~> 0.3.0")
 	
 	# spec.add_dependency("openssl")
 	

data/lib/async/http/headers.rb

@@ -18,190 +18,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'http/protocol/headers'
+
 module Async
 	module HTTP
-		class Headers
-			class Split < Array
-				COMMA = /\s*,\s*/
-				
-				def initialize(value)
-					super(value.split(COMMA))
-				end
-				
-				def << value
-					super value.split(COMMA)
-				end
-				
-				def to_s
-					join(", ")
-				end
-			end
-			
-			class Multiple < Array
-				def initialize(value)
-					super()
-					
-					self << value
-				end
-				
-				def to_s
-					join("\n")
-				end
-			end
-			
-			def self.[] hash
-				self.new(hash.to_a)
-			end
-			
-			def initialize(fields = [])
-				@fields = fields
-				@indexed = to_h
-			end
-			
-			attr :fields
-			
-			def freeze
-				return if frozen?
-				
-				@indexed = to_h
-				
-				super
-			end
-			
-			def empty?
-				@fields.empty?
-			end
-			
-			def each(&block)
-				@fields.each(&block)
-			end
-			
-			def include? key
-				self[key] != nil
-			end
-			
-			# Delete all headers with the given key, and return the value of the last one, if any.
-			def delete(key)
-				values, @fields = @fields.partition do |field|
-					field.first.downcase == key
-				end
-				
-				if @indexed
-					@indexed.delete(key)
-				end
-				
-				if field = values.last
-					return field.last
-				end
-			end
-			
-			def slice!(keys)
-				values, @fields = @fields.partition do |field|
-					keys.include?(field.first.downcase)
-				end
-				
-				if @indexed
-					keys.each do |key|
-						@indexed.delete(key)
-					end
-				end
-			end
-			
-			def add(key, value)
-				self[key] = value
-			end
-			
-			def []= key, value
-				@fields << [key, value]
-				
-				if @indexed
-					# It would be good to do some kind of validation here.
-					merge(@indexed, key.downcase, value)
-				end
-			end
-			
-			MERGE_POLICY = {
-				# Headers which may only be specified once.
-				'content-type' => false,
-				'content-disposition' => false,
-				'content-length' => false,
-				'user-agent' => false,
-				'referer' => false,
-				'host' => false,
-				'authorization' => false,
-				'proxy-authorization' => false,
-				'if-modified-since' => false,
-				'if-unmodified-since' => false,
-				'from' => false,
-				'location' => false,
-				'max-forwards' => false,
-				
-				'connection' => Split,
-				
-				# Headers specifically for proxies:
-				'via' => Split,
-				'x-forwarded-for' => Split,
-				
-				# Headers which may be specified multiple times, but which can't be concatenated.
-				'set-cookie' => Multiple,
-				'www-authenticate' => Multiple,
-				'proxy-authenticate' => Multiple
-			}.tap{|hash| hash.default = Split}
-			
-			def merge(hash, key, value)
-				if policy = MERGE_POLICY[key]
-					if current_value = hash[key]
-						current_value << value
-					else
-						hash[key] = policy.new(value)
-					end
-				else
-					raise ArgumentError, "Header #{key} can only be set once!" if hash.include?(key)
-					
-					# We can't merge these, we only expose the last one set.
-					hash[key] = value
-				end
-			end
-			
-			def [] key
-				@indexed ||= to_h
-				
-				@indexed[key]
-			end
-			
-			def to_h
-				@fields.inject({}) do |hash, (key, value)|
-					merge(hash, key.downcase, value)
-					
-					hash
-				end
-			end
-			
-			def == other
-				if other.is_a? Hash
-					to_h == other
-				else
-					@fields == other.fields
-				end
-			end
-			
-			class Merged
-				def initialize(*all)
-					@all = all
-				end
-				
-				def << headers
-					@all << headers
-				end
-				
-				def each(&block)
-					@all.each do |headers|
-						headers.each do |key, value|
-							yield key, value.to_s
-						end
-					end
-				end
-			end
-		end
+		Headers = ::HTTP::Protocol::Headers
 	end
 end

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

@@ -25,14 +25,22 @@ module Async
 	module HTTP
 		module Protocol
 			module HTTP2
-				DEFAULT_SETTINGS = {
+				CLIENT_SETTINGS = {
 					::HTTP::Protocol::HTTP2::Settings::ENABLE_PUSH => 0,
 					::HTTP::Protocol::HTTP2::Settings::MAXIMUM_CONCURRENT_STREAMS => 256,
 					::HTTP::Protocol::HTTP2::Settings::MAXIMUM_FRAME_SIZE => 0x100000,
 					::HTTP::Protocol::HTTP2::Settings::INITIAL_WINDOW_SIZE => 0x7FFFFFFF,
 				}
 				
-				def self.client(stream, settings = DEFAULT_SETTINGS)
+				SERVER_SETTINGS = {
+					::HTTP::Protocol::HTTP2::Settings::ENABLE_PUSH => 0,
+					# We choose a lower maximum concurrent streams to avoid overloading a single connection/thread.
+					::HTTP::Protocol::HTTP2::Settings::MAXIMUM_CONCURRENT_STREAMS => 32,
+					::HTTP::Protocol::HTTP2::Settings::MAXIMUM_FRAME_SIZE => 0x100000,
+					::HTTP::Protocol::HTTP2::Settings::INITIAL_WINDOW_SIZE => 0x7FFFFFFF,
+				}
+				
+				def self.client(stream, settings = CLIENT_SETTINGS)
 					client = Client.new(stream)
 					
 					client.send_connection_preface(settings)
@@ -41,7 +49,7 @@ module Async
 					return client
 				end
 				
-				def self.server(stream, settings = DEFAULT_SETTINGS)
+				def self.server(stream, settings = SERVER_SETTINGS)
 					server = Server.new(stream)
 					
 					server.read_connection_preface(settings)

data/lib/async/http/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.30.2"
+		VERSION = "0.30.3"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.30.2
+  version: 0.30.3
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-08 00:00:00.000000000 Z
+date: 2018-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement