Merge 9224cee into 9b4a4ce

lib/http/2/connection.rb

@@ -94,6 +94,7 @@ def initialize(**settings)
       @error = nil
 
       @h2c_upgrade = nil
+      @closed_since = nil
     end
 
     def closed?
@@ -144,6 +145,7 @@ def goaway(error = :no_error, payload = nil)
       send(type: :goaway, last_stream: last_stream,
            error: error, payload: payload)
       @state = :closed
+      @closed_since = Time.now
     end
 
     # Sends a WINDOW_UPDATE frame to the peer.
@@ -446,12 +448,15 @@ def connection_management(frame)
           # the connection, although a new connection can be established
           # for new streams.
           @state = :closed
+          @closed_since = Time.now
           emit(:goaway, frame[:last_stream], frame[:error], frame[:payload])
         when :altsvc, :blocked
           emit(frame[:type], frame)
         else
           connection_error
         end
+      when :closed
+        connection_error if (Time.now - @closed_since) > 15
       else
         connection_error
       end

spec/connection_spec.rb

@@ -542,6 +542,15 @@
       expect { @conn.new_stream }.to raise_error(ConnectionClosed)
     end
 
+    it 'should not raise error when receiving connection management frames immediately after emitting goaway' do
+      @conn.goaway
+      expect(@conn).to be_closed
+
+      expect { @conn << f.generate(SETTINGS.dup) }.not_to raise_error(ProtocolError)
+      expect { @conn << f.generate(PING.dup) }.not_to raise_error(ProtocolError)
+      expect { @conn << f.generate(GOAWAY.dup) }.not_to raise_error(ProtocolError)
+    end
+
     it 'should process connection management frames after GOAWAY' do
       @conn << f.generate(SETTINGS.dup)
       @conn << f.generate(HEADERS.dup)