http-2 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5f246529e7f64c9b6c841e7733a8bcc74ce34452fa0569c48bf1a858d47d659
-  data.tar.gz: ae38ca8cb1814c168fa2e90f729b12b0a3017a41d35406472dfe425308adb107
+  metadata.gz: 05c943cd91ee0339a8542cde981636d694618d64c80e30ff0f6ccb55fc636d45
+  data.tar.gz: 325abe52e215d7d7007f9fe383a3e8ebd8b1cdfae1a004fc227b5371efb637b8
 SHA512:
-  metadata.gz: 5cc781007b5fa286344fb6ebc1495b4caaddc5c25749ae1ab6fb938f18f17ac50624bbf0160cb3e6661b91d1290ea350a550696e6ed28db20f6bb34c0ca0b6c7
-  data.tar.gz: 2bbcd46df4b28f59f7b64c68338998bae8d5199ee71942704ae32fb8e643c328b888b2579db4d8bf1b8ed220e76ea1bc27d9ef14ecc5ad21c05cb35252f2e4d1
+  metadata.gz: 88a97115e7d09b247b669c304fd3bced538c8be53263ca4f2650ddae125e7d7a3fa6b97419e2f8dbac9dcd3c95a0c581a494fc4b185664ae5d2d64bee9da3d7c
+  data.tar.gz: f8f257ed1e984d82c8209677d2496c21f000c9dc23ca6f754fe50b1309c4c2b92491fb4d6dfb608eb5f54923cf47fb1a2f508bbb97fa4ec2b1d62b5f51dbb145

data/lib/http/2/connection.rb

@@ -403,8 +403,9 @@ module HTTP2
               # endpoints MAY choose to treat frames that arrive a significant
               # time after sending END_STREAM as a connection error.
               when :rst_stream
-                stream = @streams_recently_closed[stream_id]
-                connection_error(:protocol_error, msg: "sent window update on idle stream") unless stream
+                unless @streams_recently_closed.key?(stream_id)
+                  connection_error(:protocol_error, msg: "sent window update on idle stream")
+                end
               else
                 # An endpoint that receives an unexpected stream identifier
                 # MUST respond with a connection error of type PROTOCOL_ERROR.
@@ -524,7 +525,8 @@ module HTTP2
       when :closed
         case frame_type
         when :goaway
-          connection_error
+          #  6.8. GOAWAY
+          # An endpoint MAY send multiple GOAWAY frames if circumstances change.
         when :ping
           ping_management(frame)
         else

data/lib/http/2/extensions.rb

@@ -25,7 +25,7 @@ module HTTP2
     def read_str(str, n)
       return "".b if n == 0
 
-      chunk = str.byteslice(0..n - 1)
+      chunk = str.byteslice(0..(n - 1))
       remaining = str.byteslice(n..-1)
       remaining ? str.replace(remaining) : str.clear
       chunk

data/lib/http/2/framer.rb

@@ -148,9 +148,12 @@ module HTTP2
 
       header = buffer
 
+      # make sure the buffer is binary and unfrozen
       if buffer.frozen?
         header = String.new("", encoding: Encoding::BINARY, capacity: buffer.bytesize + 9) # header length
-        header << buffer
+        append_str(header, buffer)
+      else
+        header.force_encoding(Encoding::BINARY)
       end
 
       pack([
@@ -182,7 +185,7 @@ module HTTP2
       {
         type: type,
         flags: FRAME_FLAGS[type].filter_map do |name, pos|
-          name if flags.anybits?((1 << pos))
+          name if flags.anybits?(1 << pos)
         end,
         length: length,
         stream: stream & RBIT
@@ -268,7 +271,7 @@ module HTTP2
         append_str(bytes, frame[:payload])
 
       when :ping
-        bytes = frame[:payload]
+        bytes = frame[:payload].b
         raise CompressionError, "Invalid payload size (#{bytes.size} != 8 bytes)" if bytes.bytesize != 8
 
         length = 8
@@ -342,6 +345,13 @@ module HTTP2
           raise CompressionError, "Invalid padding #{padlen}"
         end
 
+        # make sure the buffer is binary and unfrozen
+        if bytes.frozen?
+          bytes = bytes.b
+        else
+          bytes.force_encoding(Encoding::BINARY)
+        end
+
         length += padlen
         pack([padlen -= 1], UINT8, buffer: bytes, offset: 0)
         frame[:flags] += [:padded]
@@ -349,7 +359,7 @@ module HTTP2
         # Padding:  Padding octets that contain no application semantic value.
         # Padding octets MUST be set to zero when sending and ignored when
         # receiving.
-        append_str(bytes, ("\0" * padlen))
+        append_str(bytes, "\0" * padlen)
       end
 
       frame[:length] = length

data/lib/http/2/header/encoding_context.rb

@@ -211,7 +211,7 @@ module HTTP2
           emit = [name, value]
 
           # add to table
-          if type == :incremental && size_check(name.bytesize + value.bytesize + 32)
+          if type == :incremental && size_check?(name.bytesize + value.bytesize + 32)
             @table.unshift(emit)
             @current_table_size += name.bytesize + value.bytesize + 32
             @_table_updated = true
@@ -302,7 +302,7 @@ module HTTP2
       #  When the size is reduced, some headers might be evicted.
       def table_size=(size)
         @limit = size
-        size_check(0)
+        resize_table(0)
       end
 
       def listen_on_table
@@ -313,22 +313,25 @@ module HTTP2
 
       private
 
+      def resize_table(cmdsize)
+        return if @table.empty?
+
+        while @current_table_size + cmdsize > @limit
+
+          name, value = @table.pop
+          @current_table_size -= name.bytesize + value.bytesize + 32
+          break if @table.empty?
+
+        end
+      end
+
       # To keep the dynamic table size lower than or equal to @limit,
       # remove one or more entries at the end of the dynamic table.
       #
       # @param cmdsize [Integer]
       # @return [Boolean] whether +cmd+ fits in the dynamic table.
-      def size_check(cmdsize)
-        unless @table.empty?
-          while @current_table_size + cmdsize > @limit
-
-            name, value = @table.pop
-            @current_table_size -= name.bytesize + value.bytesize + 32
-            break if @table.empty?
-
-          end
-        end
-
+      def size_check?(cmdsize)
+        resize_table(cmdsize)
         cmdsize <= @limit
       end
     end

data/lib/http/2/header/huffman.rb

@@ -29,7 +29,7 @@ module HTTP2
       def encode(str, buffer = "".b)
         bitstring = String.new("", encoding: Encoding::BINARY, capacity: (str.bytesize * 30) + ((8 - str.size) % 8))
         str.each_byte { |chr| append_str(bitstring, ENCODE_TABLE[chr]) }
-        append_str(bitstring, ("1" * ((8 - bitstring.size) % 8)))
+        append_str(bitstring, "1" * ((8 - bitstring.size) % 8))
         pack([bitstring], "B*", buffer: buffer)
       end
 

data/lib/http/2/stream.rb

@@ -197,21 +197,18 @@ module HTTP2
     #
     # @param frame [Hash]
     def send(frame)
-      process_priority(frame) if frame[:type] == :priority
-
       case frame[:type]
       when :data
-        # @remote_window is maintained in send_data
-        send_data(frame)
+        # stream state management is maintained in send_data
+        return send_data(frame)
       when :window_update
-        manage_state(frame) do
-          @local_window += frame[:increment]
-          emit(:frame, frame)
-        end
-      else
-        manage_state(frame) do
-          emit(:frame, frame)
-        end
+        @local_window += frame[:increment]
+      when :priority
+        process_priority(frame)
+      end
+
+      manage_state(frame) do
+        emit(:frame, frame)
       end
     end
 
@@ -384,7 +381,7 @@ module HTTP2
             else
               event(:open)
             end
-          when :priority then process_priority(frame)
+          when :priority
           else stream_error(:protocol_error)
           end
         end
@@ -405,19 +402,20 @@ module HTTP2
       # WINDOW_UPDATE on a stream in this state MUST be treated as a
       # connection error (Section 5.4.1) of type PROTOCOL_ERROR.
       when :reserved_local
-        @state = if sending
-                   case frame[:type]
-                   when :headers     then event(:half_closed_remote)
-                   when :rst_stream  then event(:local_rst)
-                   else stream_error
-                   end
-                 else
-                   case frame[:type]
-                   when :rst_stream then event(:remote_rst)
-                   when :priority, :window_update then @state
-                   else stream_error
-                   end
-                 end
+        if sending
+          case frame[:type]
+          when :headers     then event(:half_closed_remote)
+          when :rst_stream  then event(:local_rst)
+          when :priority
+          else stream_error
+          end
+        else
+          case frame[:type]
+          when :rst_stream then event(:remote_rst)
+          when :priority, :window_update
+          else stream_error
+          end
+        end
 
       # A stream in the "reserved (remote)" state has been reserved by a
       # remote peer.
@@ -434,19 +432,20 @@ module HTTP2
       # PRIORITY on a stream in this state MUST be treated as a connection
       # error (Section 5.4.1) of type PROTOCOL_ERROR.
       when :reserved_remote
-        @state = if sending
-                   case frame[:type]
-                   when :rst_stream then event(:local_rst)
-                   when :priority, :window_update then @state
-                   else stream_error
-                   end
-                 else
-                   case frame[:type]
-                   when :headers then event(:half_closed_local)
-                   when :rst_stream then event(:remote_rst)
-                   else stream_error
-                   end
-                 end
+        if sending
+          case frame[:type]
+          when :rst_stream then event(:local_rst)
+          when :priority, :window_update
+          else stream_error
+          end
+        else
+          case frame[:type]
+          when :headers then event(:half_closed_local)
+          when :rst_stream then event(:remote_rst)
+          when :priority
+          else stream_error
+          end
+        end
 
       # A stream in the "open" state may be used by both peers to send
       # frames of any type.  In this state, sending peers observe
@@ -465,12 +464,14 @@ module HTTP2
           when :data, :headers, :continuation
             event(:half_closed_local) if end_stream?(frame)
           when :rst_stream then event(:local_rst)
+          when :priority
           end
         else
           case frame[:type]
           when :data, :headers, :continuation
             event(:half_closed_remote) if end_stream?(frame)
           when :rst_stream then event(:remote_rst)
+          when :priority
           end
         end
 
@@ -490,10 +491,7 @@ module HTTP2
           case frame[:type]
           when :rst_stream
             event(:local_rst)
-          when :priority
-            process_priority(frame)
-          when :window_update
-            # nop here
+          when :priority, :window_update
           else
             stream_error
           end
@@ -502,10 +500,7 @@ module HTTP2
           when :data, :headers, :continuation
             event(:remote_closed) if end_stream?(frame)
           when :rst_stream then event(:remote_rst)
-          when :priority
-            process_priority(frame)
-          when :window_update
-            # nop here
+          when :priority, :window_update
           end
         end
 
@@ -534,9 +529,7 @@ module HTTP2
         else
           case frame[:type]
           when :rst_stream then event(:remote_rst)
-          when :priority
-            process_priority(frame)
-          when :window_update
+          when :priority, :window_update
             # nop
           else
             stream_error(:stream_closed)
@@ -584,19 +577,15 @@ module HTTP2
       when :closed
         if sending
           case frame[:type]
-          when :rst_stream # ignore
-          when :priority
-            process_priority(frame)
+          when :rst_stream, :priority
           else
             stream_error(:stream_closed) unless frame[:type] == :rst_stream
           end
-        elsif frame[:type] == :priority
-          process_priority(frame)
         else
           case @closed
           when :remote_rst, :remote_closed
             case frame[:type]
-            when :rst_stream, :window_update # nop here
+            when :priority, :rst_stream, :window_update # nop here
             else
               stream_error(:stream_closed)
             end

data/lib/http/2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTTP2
-  VERSION = "1.1.0"
+  VERSION = "1.1.2"
 end

data/sig/header/encoding_context.rbs

@@ -46,7 +46,9 @@ module HTTP2
 
       def add_to_table: (string name, string value) -> void
 
-      def size_check: (Integer cmdsize) -> bool
+      def resize_table: (Integer cmdsize) -> void
+
+      def size_check?: (Integer cmdsize) -> bool
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-2
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Tiago Cardoso
@@ -9,7 +9,7 @@ authors:
 - Kaoru Maeda
 bindir: bin
 cert_chain: []
-date: 2025-04-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Pure-ruby HTTP 2.0 protocol implementation
 email:
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Pure-ruby HTTP 2.0 protocol implementation
 test_files: []