Some error handling
This commit is contained in:
@ -1,12 +1,15 @@
|
||||
use crate::http;
|
||||
use crate::http::Status;
|
||||
|
||||
pub fn parse_request(stream: &mut http::Stream) -> Result<http::Request, String> {
|
||||
pub fn parse_request(stream: &mut http::Stream) -> Result<Option<http::Request>, String> {
|
||||
let mut buf = [0; 4096];
|
||||
let size = stream.peek(&mut buf).unwrap();
|
||||
if size == 0 {
|
||||
return Ok(None)
|
||||
}
|
||||
|
||||
let mut parser = Parser::new_request_parser(&buf[..size]);
|
||||
let header_size = parser.parse().unwrap();
|
||||
let header_size = parser.parse()?;
|
||||
|
||||
let mut header_fields = Vec::new();
|
||||
for (name, value) in parser.headers {
|
||||
@ -25,7 +28,7 @@ pub fn parse_request(stream: &mut http::Stream) -> Result<http::Request, String>
|
||||
|
||||
stream.read_exact(&mut buf[..header_size]).unwrap();
|
||||
|
||||
Ok(request)
|
||||
Ok(Some(request))
|
||||
}
|
||||
|
||||
pub fn parse_response(stream: &mut http::Stream) -> Result<http::Response, String> {
|
||||
|
Reference in New Issue
Block a user