http-2 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5f246529e7f64c9b6c841e7733a8bcc74ce34452fa0569c48bf1a858d47d659
-  data.tar.gz: ae38ca8cb1814c168fa2e90f729b12b0a3017a41d35406472dfe425308adb107
+  metadata.gz: 8c3e5ca05eb466a1e2f6c0895ccd5827987cfb8bf8ddbefeeb74210e0e6e3e97
+  data.tar.gz: 8589dab8b8c89aefc5067206219ebcac9bffbc185da25d89a5f6dccc11aafcd8
 SHA512:
-  metadata.gz: 5cc781007b5fa286344fb6ebc1495b4caaddc5c25749ae1ab6fb938f18f17ac50624bbf0160cb3e6661b91d1290ea350a550696e6ed28db20f6bb34c0ca0b6c7
-  data.tar.gz: 2bbcd46df4b28f59f7b64c68338998bae8d5199ee71942704ae32fb8e643c328b888b2579db4d8bf1b8ed220e76ea1bc27d9ef14ecc5ad21c05cb35252f2e4d1
+  metadata.gz: d66c154674cdd29924c0c169ce60c8eeda6ba833b435b2db74b787e86bab101a7f9748f4fb632ecbecf32aaa216fdf1cd9e8d73c333cd501f454b52d0628c6fe
+  data.tar.gz: 68f86eca1a92474fd7802502af0883595b52afe42c49c975ea6952e79a523c59508ad5213d18f77f9a50a4539deb6200013407b001f81dcdb5560639ef030242

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.

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([
@@ -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]

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.1"
 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.1
 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: 2025-04-16 00:00:00.000000000 Z
 dependencies: []
 description: Pure-ruby HTTP 2.0 protocol implementation
 email: