Skip to content

Make sure we poll trailers after decompressing body #585

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

Draft
ulyssa wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Make sure we poll trailers after decompressing body #585

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
29 changes: 19 additions & 10 deletions src/body.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ impl HttpBody for Body {
mut self: Pin<&mut Self>,
cx: &mut Context,
) -> Poll<Option<Result<Self::Data, Self::Error>>> {
while let Some(mut chunk) = self.chunks.pop_front() {
while let Some(chunk) = self.chunks.pop_front() {
match chunk {
Chunk::HttpBody(mut body) => {
let body_mut = &mut body;
Expand Down Expand Up @@ -294,22 +294,30 @@ impl HttpBody for Body {
}
}
}
Chunk::CompressedHttpBody(ref mut decoder_state, ref mut body) => {
pin_mut!(body);
Chunk::CompressedHttpBody(mut decoder_state, mut body) => {
let body_mut = &mut body;
pin_mut!(body_mut);

match body.poll_data(cx) {
match body_mut.poll_data(cx) {
Poll::Pending => {
// put the body back, so we can poll it again next time
let chunk = Chunk::CompressedHttpBody(decoder_state, body);
self.chunks.push_front(chunk);
return Poll::Pending;
}
Poll::Ready(None) => match decoder_state.try_finish() {
Err(e) => return Poll::Ready(Some(Err(e.into()))),
Ok(()) => {
let chunk = decoder_state.get_mut().get_mut().split().freeze();
return Poll::Ready(Some(Ok(chunk)));
Poll::Ready(None) => {
match decoder_state.try_finish() {
Err(e) => return Poll::Ready(Some(Err(e.into()))),
Ok(()) => {
// The body is done, but we put it back so that
// we make sure to poll trailers next:
self.chunks.push_front(body.into());

let chunk = decoder_state.get_mut().get_mut().split().freeze();
return Poll::Ready(Some(Ok(chunk)));
}
}
},
}
Poll::Ready(Some(Err(e))) => return Poll::Ready(Some(Err(e.into()))),
Poll::Ready(Some(Ok(bytes))) => {
match decoder_state.write_all(&bytes) {
Expand All @@ -319,6 +327,7 @@ impl HttpBody for Body {
let resulting_bytes =
decoder_state.get_mut().get_mut().split().freeze();
// put the body back, so we can poll it again next time
let chunk = Chunk::CompressedHttpBody(decoder_state, body);
self.chunks.push_front(chunk);
if resulting_bytes.is_empty() {
// If we got no bytes from this chunk, it might be just the gzip header
Expand Down
Loading