actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2025-06-26 18:37:41 +02:00
Code Issues Releases Wiki Activity

Fix panic on invalid URL characters #130

Browse Source
This commit is contained in:
Nikolay Kim
2018-03-22 18:08:12 -07:00
parent b942bcc4a6
commit 5a25fd95f5
4 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/server/h1.rs
View File

@ -164,6 +164,8 @@ impl<T, H> Http1<T, H>
},
Ok(Async::NotReady) => (),
Err(err) => {
trace!("Parse error: {:?}", err);
// notify all tasks
self.stream.disconnected();
for entry in &mut self.tasks {
@ -293,9 +295,9 @@ impl<T, H> Http1<T, H>
// deal with keep-alive
if self.tasks.is_empty() {
// no keep-alive situations
if (self.flags.contains(Flags::ERROR)
|| !self.flags.contains(Flags::KEEPALIVE)
|| !self.settings.keep_alive_enabled()) &&
if self.flags.contains(Flags::ERROR) ||
(!self.flags.contains(Flags::KEEPALIVE)
|| !self.settings.keep_alive_enabled()) &&
self.flags.contains(Flags::STARTED)
{
return Ok(Async::Ready(false))
@ -502,10 +504,11 @@ impl Reader {
let mut req = httparse::Request::new(&mut headers);
match req.parse(b)? {
httparse::Status::Complete(len) => {
let method = Method::from_bytes(req.method.unwrap().as_bytes())
let method = Method::from_bytes(
req.method.unwrap_or("").as_bytes())
.map_err(|_| ParseError::Method)?;
let path = Uri::try_from(req.path.unwrap()).unwrap();
let version = if req.version.unwrap() == 1 {
let path = Uri::try_from(req.path.unwrap())?;
let version = if req.version.unwrap_or(1) == 1 {
Version::HTTP_11
} else {
Version::HTTP_10