Make Body know about incoming Content-Length #1554
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lnicola
force-pushed
the
incoming-body-len
branch
2 times, most recently
from
2d69173 to
6f755b5
Compare
lnicola
changed the title
seanmonstar
reviewed
Jun 8, 2018
src/body/body.rs
Outdated
| /// | ||
| /// Useful when wanting to stream chunks from another thread. | ||
| #[inline] | ||
| pub fn channel_with_length(content_length: u64) -> (Sender, Body) { |
There was a problem hiding this comment.
For now, I'd suggest making this just pub(crate).
Oh and then, these 2 functions can probably be reduced to calling a 3rd, private constructor, fn new_channel(content_length: Option<u64>), to remove duplicate code, yea?
src/body/body.rs
Outdated
| Async::Ready(Some(Ok(chunk))) => Ok(Async::Ready(Some(chunk))), | ||
| Async::Ready(Some(Ok(chunk))) => { | ||
| if let Some(ref mut len) = *len { | ||
| match len.checked_sub(chunk.len() as u64) { |
There was a problem hiding this comment.
If the constructor to set a length on the channel variant is private, we can rely on hyper's decoder to always limit the body size that is streamed (it enforces the length from the connection). Just for sanity, we could keep a debug assertion. Something like:
if let Some(ref mut len) = *len {
debug_assert!(*len >= chunk.len());
*len = *len - chunk.len();
}
lnicola
force-pushed
the
incoming-body-len
branch
2 times, most recently
from
e283968 to
2d885f7
Compare
lnicola
force-pushed
the
incoming-body-len
branch
from
2d885f7 to
b27ba1d
Compare
|
Done, I think. |
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1545.
I'm not sure about: