@@ -154,8 +154,17 @@ frameReceiver ctx mkreq recvN = loop `E.catch` sendGoaway
155 writeIORef currentStreamId streamId
155 writeIORef currentStreamId streamId
156 cnt <- readIORef concurrency
156 cnt <- readIORef concurrency
157− when (cnt >= recommendedConcurrency) $
157+ when (cnt >= recommendedConcurrency) $ do
158+ -- Record that the stream is closed, rather than
159+ -- idle, so that receiving frames on it is only a
161+ consume payloadLength
162+ strm <- newStream streamId 0
163+ writeIORef (streamState strm) $ Closed $
164+ ResetByMe $ E.toException $
165+ StreamError RefusedStream streamId
166+ insert streamTable streamId strm
158− E.throwIO $ ConnectionError RefusedStream "over max concurrency"
167+ E.throwIO $ StreamError RefusedStream streamId
159 ws <- initialWindowSize <$> readIORef http2settings
168 ws <- initialWindowSize <$> readIORef http2settings
160 newstrm <- newStream streamId (fromIntegral ws)
169 newstrm <- newStream streamId (fromIntegral ws)
161 when (ftyp == FrameHeaders) $ opened ctx newstrm
170 when (ftyp == FrameHeaders) $ opened ctx newstrm
@@ -315,5 +324,7 @@ stream FramePriority header bs Context{outputQ} s Stream{streamNumber} = do
316-- this ordering is important
325-- this ordering is important
317stream _ _ _ _ (Open Continued{}) _ = E.throwIO $ ConnectionError ProtocolError "an illegal frame follows header/continuation frames"
326stream _ _ _ _ (Open Continued{}) _ = E.throwIO $ ConnectionError ProtocolError "an illegal frame follows header/continuation frames"
327+-- Ignore frames to streams we have just reset, per section 5.1.
328+stream _ _ _ _ st@(Closed (ResetByMe _)) _ = return st
318stream FrameData FrameHeader{streamId} _ _ _ _ = E.throwIO $ StreamError StreamClosed streamId
329stream FrameData FrameHeader{streamId} _ _ _ _ = E.throwIO $ StreamError StreamClosed streamId
319stream _ FrameHeader{streamId} _ _ _ _ = E.throwIO $ StreamError ProtocolError streamId
330stream _ FrameHeader{streamId} _ _ _ _ = E.throwIO $ StreamError ProtocolError streamId