Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion src/iter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,21 @@ impl<'a> Bytes<'a> {

#[inline]
pub fn peek(&self) -> Option<u8> {
self.slice.get(self.pos).cloned()
self.peek_ahead(0)
}

#[inline]
pub fn peek_ahead(&self, n: usize) -> Option<u8> {
self.slice.get(self.pos + n).cloned()
}

#[inline]
pub fn peek_4(&self) -> Option<&[u8]> {
if self.slice.len() >= self.pos + 4 {
Some(&self.slice[self.pos..=self.pos + 3])
} else {
None
}
}

#[inline]
Expand Down Expand Up @@ -62,6 +76,16 @@ impl<'a> Bytes<'a> {
head
}

#[inline]
pub unsafe fn advance_and_commit(&mut self, n: usize) {
debug_assert!(self.pos + n <= self.slice.len(), "overflow");
self.pos += n;
let ptr = self.slice.as_ptr();
let tail = slice::from_raw_parts(ptr.add(n), self.slice.len() - n);
self.pos = 0;
self.slice = tail;
}

#[inline]
pub fn next_8<'b>(&'b mut self) -> Option<Bytes8<'b, 'a>> {
if self.slice.len() >= self.pos + 8 {
Expand Down
19 changes: 17 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -475,10 +475,25 @@ impl<'h, 'b> Request<'h, 'b> {
config: &ParserConfig,
mut headers: &'h mut [MaybeUninit<Header<'b>>],
) -> Result<usize> {
let orig_len = buf.len();
let orig_len = buf.len();
let mut bytes = Bytes::new(buf);
complete!(skip_empty_lines(&mut bytes));
self.method = Some(complete!(parse_token(&mut bytes)));
let method = match bytes.peek_4() {
Some(b"GET ") => {
unsafe {
bytes.advance_and_commit(4);
}
"GET"
}
Some(b"POST") if bytes.peek_ahead(4) == Some(b' ') => {
unsafe {
bytes.advance_and_commit(5);
}
"POST"
}
_ => complete!(parse_token(&mut bytes)),
};
self.method = Some(method);
if config.allow_multiple_spaces_in_request_line_delimiters {
complete!(skip_spaces(&mut bytes));
}
Expand Down