initial_remaining: usize,
length_hint: usize,
body: hyper::body::Body,
+ boundary_finder: multipart::BoundaryFinder,
reply_to: tokio::sync::oneshot::Sender<WebResponse>,
warnings: Warnings,
}
Err(ReadLimitedError::Hyper(e)) => throw!(e),
};
- let finder = memmem::Finder::new(&boundary);
- let mut find_iter = finder.find_iter(&initial);
+ let boundary_finder = memmem::Finder::new(&boundary);
+ let mut boundary_iter = boundary_finder.find_iter(&initial);
let start = if initial.starts_with(&boundary[1..]) { boundary.len()-1 }
- else if let Some(start) = find_iter.next() { start + boundary.len() }
+ else if let Some(start) = boundary_iter.next() { start + boundary.len() }
else { throw!(anyhow!("initial boundary not found")) };
- let comp = multipart::process_component
+ let comp = multipart::process_boundary
(&mut warnings, &initial[start..], PartName::m)?
.ok_or_else(|| anyhow!(r#"no "m" component"#))?;
r#"first multipart component must be name="m""#
)) }
- let mut meta = MetadataFieldIterator::new(comp.payload_start);
+ let mut meta = MetadataFieldIterator::new(comp.payload);
let client: ClientName = meta.need_parse().context("client addr")?;
initial,
initial_remaining,
length_hint,
+ boundary_finder: boundary_finder.into_owned(),
body,
warnings: mem::take(&mut warnings),
reply_to
{
let WebRequest {
initial, initial_remaining, length_hint, mut body,
+ boundary_finder,
reply_to, warnings,
} = req.ok_or_else(|| anyhow!("webservers all shut down!"))?;