forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Parse the DELETE method and transition to push from push_char.

Browse Source
This commit is contained in:
Jonathan Reem
2014-09-26 22:57:31 -04:00
parent 48dca53e88
commit 8d1c6a790e
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/http.rs
View File

@@ -359,9 +359,10 @@ pub fn read_method<R: Reader>(stream: &mut R) -> HttpResult<method::Method> {
(MsStart, b'O') => state = MsO, (MsStart, b'O') => state = MsO,
(MsStart, b'T') => state = MsT, (MsStart, b'T') => state = MsT,
(MsStart, b'C') => state = MsC, (MsStart, b'C') => state = MsC,
(MsStart, b'D') => state = MsD,
(MsStart, b@b'A'..b'Z') => { (MsStart, b@b'A'..b'Z') => {
state = MsExt; state = MsExt;
s.push_char(b as char) s.push(b as char)
}, },
(MsG, b'E') => state = MsGE, (MsG, b'E') => state = MsGE,
@@ -402,11 +403,17 @@ pub fn read_method<R: Reader>(stream: &mut R) -> HttpResult<method::Method> {
(MsCONNE, b'C') => state = MsCONNEC, (MsCONNE, b'C') => state = MsCONNEC,
(MsCONNEC, b'T') => state = MsCONNECT, (MsCONNEC, b'T') => state = MsCONNECT,
(MsExt, b@b'A'..b'Z') => s.push_char(b as char), (MsD, b'E') => state = MsDE,
(MsDE, b'L') => state = MsDEL,
(MsDEL, b'E') => state = MsDELE,
(MsDELE, b'T') => state = MsDELET,
(MsDELET, b'E') => state = MsDELETE,
(MsExt, b@b'A'..b'Z') => s.push(b as char),
(_, b@b'A'..b'Z') => { (_, b@b'A'..b'Z') => {
s = state.as_slice().to_string(); s = state.as_slice().to_string();
s.push_char(b as char); s.push(b as char);
}, },
(MsGET, SP) => return Ok(method::Get), (MsGET, SP) => return Ok(method::Get),
@@ -437,7 +444,7 @@ pub fn read_uri<R: Reader>(stream: &mut R) -> HttpResult<uri::RequestUri> {
try!(expect(stream.read_byte(), SP)); try!(expect(stream.read_byte(), SP));
return Ok(uri::Star) return Ok(uri::Star)
} else { } else {
s.push_char(b as char); s.push(b as char);
loop { loop {
match try_io!(stream.read_byte()) { match try_io!(stream.read_byte()) {
SP => { SP => {
@@ -446,7 +453,7 @@ pub fn read_uri<R: Reader>(stream: &mut R) -> HttpResult<uri::RequestUri> {
CR | LF => { CR | LF => {
return Err(HttpUriError) return Err(HttpUriError)
}, },
b => s.push_char(b as char) b => s.push(b as char)
} }
} }
} }