Skip to content

fix(http/retry): is_end_stream() is true for empty bodies #3558

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

Merged
merged 1 commit into from
Jan 22, 2025
Merged

fix(http/retry): is_end_stream() is true for empty bodies #3558

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
16 changes: 13 additions & 3 deletions linkerd/http/retry/src/peek_trailers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,18 @@ where

#[inline]
fn is_end_stream(&self) -> bool {
self.first_data.is_none() && self.trailers.is_none() && self.inner.is_end_stream()
let Self {
inner,
first_data,
trailers,
} = self;

let trailers_finished = match trailers {
Some(Ok(Some(_)) | Err(_)) => false,
None | Some(Ok(None)) => true,
};

first_data.is_none() && trailers_finished && inner.is_end_stream()
}

#[inline]
Expand Down Expand Up @@ -254,8 +265,7 @@ mod tests {
let empty = MockBody::default();
let peek = PeekTrailersBody::read_body(empty).await;
assert!(peek.peek_trailers().is_none());
// TODO(kate): this will not return `true`.
// assert!(peek.is_end_stream());
assert!(peek.is_end_stream());
}

#[tokio::test]
Expand Down
Loading