async-http 0.43.0 → 0.43.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3bffeca561f19d6963c549eb6e3f0a570d9d858db4d10a925e7c04e6dbef562
-  data.tar.gz: f366ca5851cd1f07b5d3339342206a8e141da9981664db29080952a30bfafb24
+  metadata.gz: 901472f2bea3d4389d6ac6adab0b2e78a86991e10da7a2e92a3fbae69f66e9a8
+  data.tar.gz: df036f736d8314edf42f784b159acfc2fd7c755294aae26130f23fcd5187a49b
 SHA512:
-  metadata.gz: 7e5fb8fe9055183a638a51ba6565f7971ab796c5a4331b7ebfadf113b1f2da450613a6f7b7719d04eb23f75994b3c0b1508bd89f101f3322248cb7d4adbed581
-  data.tar.gz: 7b18f8cad97b8f8264773134b90d2d74a4493898cf7a47c56b60ef1f343fe839c7e0b7352968f6d2da71249c2857e7ffad7c3a5ba65ba6b365a1460f46d5f353
+  metadata.gz: 379eb7bf5cb3ee6ee187989789869274e6f21fdf4fd5cfe60d0c492cec037898147675eac89b9974d7ecc99138664202628d330c66a00cddda4a3090b7285e2f
+  data.tar.gz: e1a8232a2f28032cc5ba057b0be010f4fc807e3e6f824dfa84507eb50272106d5d80d0f45b7e7f810ef4bac6c6d7d2be910280cc00f45487af42c8b1de194678

data/.gitignore

@@ -1,5 +1,7 @@
+.tags
+
 /.bundle/
-/.tags
+/.yardoc
 /Gemfile.lock
 /_yardoc/
 /coverage/
@@ -8,5 +10,5 @@
 /spec/reports/
 /tmp/
 
-# rspec failure tracking
 .rspec_status
+.covered.db

data/.travis.yml

@@ -2,28 +2,30 @@ language: ruby
 dist: xenial
 cache: bundler
 
-before_install:
-  - gem update --system
-  - gem install bundler
-
 addons:
   apt:
     packages:
     - wrk
     - apache2-utils
+  homebrew:
+    packages:
+    - wrk
 
 matrix:
   include:
     - rvm: 2.4
     - rvm: 2.5
     - rvm: 2.6
+    - rvm: 2.6
+      env: COVERAGE=Summary,Coveralls
     - rvm: truffleruby
     - rvm: jruby-head
       env: JRUBY_OPTS="--debug -X+O"
     - rvm: ruby-head
-    - rvm: rbx-3
+    - rvm: 2.6
+      os: osx
   allow_failures:
-    - rvm: ruby-head
     - rvm: truffleruby
+    - rvm: ruby-head
     - rvm: jruby-head
-    - rvm: rbx-3
+    - rvm: truffleruby

data/Gemfile

@@ -6,8 +6,3 @@ gemspec
 group :development do
 	gem 'pry'
 end
-
-group :test do
-	gem 'simplecov'
-	gem 'coveralls', require: false
-end

data/async-http.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
 	spec.add_development_dependency "async-rspec", "~> 1.10"
 	spec.add_development_dependency "async-container", "~> 0.5.0"
 	
+	spec.add_development_dependency "covered"
 	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "rspec", "~> 3.6"
 	spec.add_development_dependency "rake"

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

@@ -31,6 +31,7 @@ module Async
 						end
 					end
 					
+					# @param reason [String] HTTP response line reason, ignored.
 					def initialize(connection, version, status, reason, headers, body)
 						@connection = connection
 						

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

@@ -40,7 +40,6 @@ module Async
 				}
 				
 				SERVER_SETTINGS = {
-					::Protocol::HTTP2::Settings::ENABLE_PUSH => 1,
 					# We choose a lower maximum concurrent streams to avoid overloading a single connection/thread.
 					::Protocol::HTTP2::Settings::MAXIMUM_CONCURRENT_STREAMS => 32,
 					::Protocol::HTTP2::Settings::MAXIMUM_FRAME_SIZE => 0x100000,

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

@@ -48,12 +48,12 @@ module Async
 					
 					# Used by the client to send requests to the remote server.
 					def call(request)
+						raise ::Protocol::HTTP2::Error, "Connection closed!" if self.closed?
+						
 						@count += 1
 						
 						response = Response.new(self, next_stream_id)
-						
 						response.send_request(request)
-						
 						response.wait
 						
 						return response

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

@@ -20,6 +20,8 @@
 
 require_relative 'stream'
 
+require 'async/semaphore'
+
 module Async
 	module HTTP
 		module Protocol
@@ -29,7 +31,6 @@ module Async
 				METHOD = ':method'.freeze
 				PATH = ':path'.freeze
 				AUTHORITY = ':authority'.freeze
-				REASON = 'reason'.freeze
 				STATUS = ':status'.freeze
 				PROTOCOL = ':protocol'.freeze
 				
@@ -41,6 +42,9 @@ module Async
 						
 						@count = 0
 						@reader = nil
+						
+						# Writing multiple frames at the same time can cause odd problems if frames are only partially written. So we use a semaphore to ensure frames are written in their entirety.
+						@write_frame_guard = Async::Semaphore.new(1)
 					end
 					
 					attr :stream
@@ -61,13 +65,19 @@ module Async
 						@reader = nil
 					end
 					
+					def write_frame(frame)
+						# We don't want to write multiple frames at the same time.
+						@write_frame_guard.acquire do
+							super
+						end
+					end
+					
 					def read_in_background(task: Task.current)
 						task.async do |nested_task|
 							nested_task.annotate("#{version} reading data for #{self.class}")
 							
 							begin
-								# Even thought the connection might be logically closed, we are not done until all HTTP/2 streams are closed or the underlying I/O is closed.
-								while !@stream.closed?
+								while !self.closed?
 									self.read_frame
 								end
 							ensure

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

@@ -127,7 +127,6 @@ module Async
 					
 					NO_RESPONSE = [
 						[STATUS, '500'],
-						[REASON, "No response generated"]
 					]
 					
 					def send_response(response)
@@ -138,14 +137,14 @@ module Async
 								[STATUS, response.status],
 							]
 							
-							if length = response.body.length
-								pseudo_headers << [CONTENT_LENGTH, length]
-							end
-							
 							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
@@ -154,7 +153,7 @@ module Async
 							@stream.send_headers(nil, headers)
 							@stream.send_body(response.body)
 						else
-							headers = Headers::Merged.new([
+							headers = ::Protocol::HTTP::Headers::Merged.new([
 								[STATUS, response.status],
 							], response.headers)
 							

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

@@ -85,8 +85,6 @@ module Async
 						headers.each do |key, value|
 							if key == STATUS
 								@status = Integer(value)
-							elsif key == REASON
-								@reason = value
 							elsif key == CONTENT_LENGTH
 								@length = Integer(value)
 							elsif key == PROTOCOL

data/lib/async/http/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.43.0"
+		VERSION = "0.43.1"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.43.0
+  version: 0.43.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2019-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: covered
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement