rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Deduplicate response streaming code for sized and chunked bodies.

This commit is contained in:
Michael Howell 2020-01-24 22:34:17 +00:00 committed by Sergio Benitez
parent d5483cb196
commit 5f3baf240a
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/lib/src/rocket.rs
View File

@ -136,23 +136,22 @@ impl Rocket {
hyp_res = hyp_res.header(header::CONTENT_LENGTH, "0"); hyp_res = hyp_res.header(header::CONTENT_LENGTH, "0");
send_response(hyp_res, hyper::Body::empty())?; send_response(hyp_res, hyper::Body::empty())?;
} }
Some(Body::Sized(body, size)) => { Some(body) => {
let (body, chunk_size) = match body {
Body::Chunked(body, chunk_size) => {
(body, chunk_size.try_into().expect("u64 -> usize overflow"))
}
Body::Sized(body, size) => {
hyp_res = hyp_res.header(header::CONTENT_LENGTH, size.to_string()); hyp_res = hyp_res.header(header::CONTENT_LENGTH, size.to_string());
let (mut sender, hyp_body) = hyper::Body::channel(); (body, 4096usize)
send_response(hyp_res, hyp_body)?;
let mut stream = body.into_bytes_stream(4096);
while let Some(next) = stream.next().await {
sender.send_data(next?).await.map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
} }
} };
Some(Body::Chunked(body, chunk_size)) => {
// TODO.async: This is identical to Body::Sized except for the chunk size
let (mut sender, hyp_body) = hyper::Body::channel(); let (mut sender, hyp_body) = hyper::Body::channel();
send_response(hyp_res, hyp_body)?; send_response(hyp_res, hyp_body)?;
let mut stream = body.into_bytes_stream(chunk_size.try_into().expect("u64 -> usize overflow")); let mut stream = body.into_bytes_stream(chunk_size);
while let Some(next) = stream.next().await { while let Some(next) = stream.next().await {
sender.send_data(next?).await.map_err(|e| io::Error::new(io::ErrorKind::Other, e))?; sender.send_data(next?).await.map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
} }