http-2 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7732a1022ca5c6c097c2b575ef214e7118d2646
-  data.tar.gz: 6d9def6bbeb440c2070edb5bd3cc38313cd360fe
+  metadata.gz: df6b5bd32b2217bebfb3205cfab1bd78f2a5456d
+  data.tar.gz: eb9d683a528819195bf81d4480549b2d8ac7bab6
 SHA512:
-  metadata.gz: c166616d45fdf27d87514770287e409dcdc97a5f0e821fe4da970fd99b3487cbbe7b2679d99e055d3b04474eb92bf27cd8655509d5facc55315a351b1a1d2246
-  data.tar.gz: a6888d5a873081b38bd2245f7c6c1be6cf456b5a39b7adc595b8b693fcac31fc50f3bd876c6293f93c76ec37cdb924aa846562eff71215d5e4af60bf282e452f
+  metadata.gz: 686e87ef8beeedd1f3ac1371845b759687231ba62e3bab532d3d15d65febc179bc19f44d4a025708ecc62e2f0e7dd0689cfbbeef19e47c8ee52df9d050066228
+  data.tar.gz: 41b003cfeb4a127efcf9d4709167db3ff40934a175a08bd19d23a3874d6dd7e615f99ab967c5b85b521e54a4cdbfce33b4087c6ddde7eebd0d0fc11d18a4d551

data/.travis.yml

@@ -4,7 +4,8 @@ rvm:
   - 2.1
   - 2.2
   - 2.3.0
-  - jruby-9.0.0.0
+  - 2.4.0
+  - jruby-9.1.8.0
   - jruby-head
   - rbx-2
 matrix:

data/lib/http/2/connection.rb

@@ -313,11 +313,12 @@ module HTTP2
             if (stream = @streams[frame[:stream]])
               stream << frame
             else
+              case frame[:type]
               # The PRIORITY frame can be sent for a stream in the "idle" or
               # "closed" state. This allows for the reprioritization of a
               # group of dependent streams by altering the priority of an
               # unused or closed parent stream.
-              if frame[:type] == :priority
+              when :priority
                 stream = activate_stream(
                   id:         frame[:stream],
                   weight:     frame[:weight] || DEFAULT_WEIGHT,
@@ -327,6 +328,14 @@ module HTTP2
 
                 emit(:stream, stream)
                 stream << frame
+
+              # WINDOW_UPDATE can be sent by a peer that has sent a frame
+              # bearing the END_STREAM flag. This means that a receiver could
+              # receive a WINDOW_UPDATE frame on a "half-closed (remote)" or
+              # "closed" stream. A receiver MUST NOT treat this as an error
+              # (see Section 5.1).
+              when :window_update
+                process_window_update(frame)
               else
                 # An endpoint that receives an unexpected stream identifier
                 # MUST respond with a connection error of type PROTOCOL_ERROR.
@@ -549,9 +558,9 @@ module HTTP2
           # Setting header table size might cause some headers evicted
           case side
           when :local
-            @decompressor.table_size = v
-          when :remote
             @compressor.table_size = v
+          when :remote
+            @decompressor.table_size = v
           end
 
         when :settings_enable_push
@@ -680,5 +689,9 @@ module HTTP2
       backtrace = (e && e.backtrace) || []
       fail Error.const_get(klass), msg, backtrace
     end
+
+    def manage_state(_)
+      yield
+    end
   end
 end

data/lib/http/2/flow_buffer.rb

@@ -52,9 +52,11 @@ module HTTP2
           sent = frame_size
         end
 
-        frames = encode ? encode(frame) : [frame]
-        frames.each { |f| emit(:frame, f) }
-        @remote_window -= sent
+        manage_state(frame) do
+          frames = encode ? encode(frame) : [frame]
+          frames.each { |f| emit(:frame, f) }
+          @remote_window -= sent
+        end
       end
     end
 

data/lib/http/2/stream.rb

@@ -125,9 +125,6 @@ module HTTP2
     #
     # @param frame [Hash]
     def send(frame)
-      transition(frame, true)
-      frame[:stream] ||= @id
-
       process_priority(frame) if frame[:type] == :priority
 
       case frame[:type]
@@ -135,13 +132,15 @@ module HTTP2
         # @remote_window is maintained in send_data
         send_data(frame)
       when :window_update
-        @local_window += frame[:increment]
-        emit(:frame, frame)
+        manage_state(frame) do
+          @local_window += frame[:increment]
+          emit(:frame, frame)
+        end
       else
-        emit(:frame, frame)
+        manage_state(frame) do
+          emit(:frame, frame)
+        end
       end
-
-      complete_transition(frame)
     end
 
     # Sends a HEADERS frame containing HTTP response headers.
@@ -603,5 +602,12 @@ module HTTP2
       klass = error.to_s.split('_').map(&:capitalize).join
       fail Error.const_get(klass), msg
     end
+
+    def manage_state(frame)
+      transition(frame, true)
+      frame[:stream] ||= @id
+      yield
+      complete_transition(frame)
+    end
   end
 end

data/lib/http/2/version.rb

@@ -1,3 +1,3 @@
 module HTTP2
-  VERSION = '0.8.3'.freeze
+  VERSION = '0.8.4'.freeze
 end

data/spec/stream_spec.rb

@@ -378,6 +378,30 @@ RSpec.describe HTTP2::Stream do
         end
       end
 
+      it 'should not transition to closed if END_STREAM flag is sent when overflowing window' do
+        @stream.on(:close) { fail 'should not have closed' }
+        data = { type: :data, flags: [], stream: @stream.id }
+        4.times do
+          data = data.merge(flags: [:end_stream]) if @stream.remote_window < 16_384
+          @stream.send data.merge(payload: 'x' * 16_384)
+        end
+      end
+
+      it 'should transition to closed when send buffer is emptied' do
+        o = Object.new
+        expect(o).to receive(:tap).once
+        @stream.on(:close) do
+          expect(@stream.buffered_amount).to eq 0
+          o.tap
+        end
+        data = { type: :data, flags: [], stream: @stream.id }
+        4.times do
+          data = data.merge(flags: [:end_stream]) if @stream.remote_window < 16_384
+          @stream.send data.merge(payload: 'x' * 16_384)
+        end
+        @client << Framer.new.generate(type: :window_update, stream: @stream.id, increment: 16_384)
+      end
+
       it 'should transition to closed if RST_STREAM is sent' do
         @stream.close
         expect(@stream.state).to eq :closed

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-2
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Ilya Grigorik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Pure-ruby HTTP 2.0 protocol implementation
@@ -124,4 +124,3 @@ test_files:
 - spec/stream_spec.rb
 - spec/support/deep_dup.rb
 - spec/support/duplicable.rb
-has_rdoc: