Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: notify_recv after send_reset() in reset_on_recv_stream_err() to … #818

Merged
merged 1 commit into from
Nov 12, 2024
Merged

fix: notify_recv after send_reset() in reset_on_recv_stream_err() to … #818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/proto/streams/streams.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1576,6 +1576,9 @@ impl Actions {
// Reset the stream.
self.send
.send_reset(reason, initiator, buffer, stream, counts, &mut self.task);
self.recv.enqueue_reset_expiration(stream, counts);
// if a RecvStream is parked, ensure it's notified
stream.notify_recv();
Ok(())
} else {
tracing::warn!(
Expand Down
7 changes: 6 additions & 1 deletion tests/h2-tests/tests/stream_states.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,12 @@ async fn recv_next_stream_id_updated_by_malformed_headers() {
client.recv_frame(frames::go_away(1).protocol_error()).await;
};
let srv = async move {
let mut srv = server::handshake(io).await.expect("handshake");
let mut srv = server::Builder::new()
// forget the bad stream immediately
.max_concurrent_reset_streams(0)
.handshake::<_, Bytes>(io)
.await
.expect("handshake");
let res = srv.next().await.unwrap();
let err = res.unwrap_err();
assert_eq!(err.reason(), Some(h2::Reason::PROTOCOL_ERROR));
Expand Down