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

Migrated from .. to ... to respond to upstream changes.

Browse Source
This commit is contained in:
Jonathan Reem
2014-10-04 02:44:57 -07:00
parent 28629281ae
commit 7d86296169
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/http.rs
View File

@@ -106,15 +106,15 @@ fn read_chunk_size<R: Reader>(rdr: &mut R) -> IoResult<uint> {
let mut in_ext = false; let mut in_ext = false;
loop { loop {
match try!(rdr.read_byte()) { match try!(rdr.read_byte()) {
b@b'0'..b'9' if !in_ext => { b@b'0'...b'9' if !in_ext => {
size *= radix; size *= radix;
size += (b - b'0') as uint; size += (b - b'0') as uint;
}, },
b@b'a'..b'f' if !in_ext => { b@b'a'...b'f' if !in_ext => {
size *= radix; size *= radix;
size += (b + 10 - b'a') as uint; size += (b + 10 - b'a') as uint;
}, },
b@b'A'..b'F' if !in_ext => { b@b'A'...b'F' if !in_ext => {
size *= radix; size *= radix;
size += (b + 10 - b'A') as uint; size += (b + 10 - b'A') as uint;
}, },
@@ -185,7 +185,7 @@ impl<W: Writer> Writer for HttpWriter<W> {
if len > *remaining { if len > *remaining {
let len = *remaining; let len = *remaining;
*remaining = 0; *remaining = 0;
try!(w.write(msg.slice_to(len))); // msg[..len] try!(w.write(msg.slice_to(len))); // msg[...len]
Err(io::standard_error(io::ShortWrite(len))) Err(io::standard_error(io::ShortWrite(len)))
} else { } else {
*remaining -= len; *remaining -= len;
@@ -224,9 +224,9 @@ pub static LINE_ENDING: &'static [u8] = &[CR, LF];
#[inline] #[inline]
pub fn is_token(b: u8) -> bool { pub fn is_token(b: u8) -> bool {
match b { match b {
b'a'..b'z' | b'a'...b'z' |
b'A'..b'Z' | b'A'...b'Z' |
b'0'..b'9' | b'0'...b'9' |
b'!' | b'!' |
b'#' | b'#' |
b'$' | b'$' |
@@ -360,7 +360,7 @@ pub fn read_method<R: Reader>(stream: &mut R) -> HttpResult<method::Method> {
(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'D') => state = MsD,
(MsStart, b@b'A'..b'Z') => { (MsStart, b@b'A'...b'Z') => {
state = MsExt; state = MsExt;
s.push(b as char) s.push(b as char)
}, },
@@ -409,9 +409,9 @@ pub fn read_method<R: Reader>(stream: &mut R) -> HttpResult<method::Method> {
(MsDELE, b'T') => state = MsDELET, (MsDELE, b'T') => state = MsDELET,
(MsDELET, b'E') => state = MsDELETE, (MsDELET, b'E') => state = MsDELETE,
(MsExt, b@b'A'..b'Z') => s.push(b as char), (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(b as char); s.push(b as char);
}, },