mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-11-27 12:01:15 +00:00
Code Issues Projects Releases Wiki Activity

optimize payload detection

Browse source
This commit is contained in:
Nikolay Kim 2017-12-25 07:31:12 -08:00
parent 012d55e424
commit 98b0e023f3
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/h1.rs
View file

@ -581,9 +581,7 @@ impl Reader {
msg msg
}; };
let decoder = if msg.get_ref().method == Method::CONNECT { let decoder = if let Some(len) = msg.get_ref().headers.get(header::CONTENT_LENGTH) {
Some(Decoder::eof())
} else if let Some(len) = msg.get_ref().headers.get(header::CONTENT_LENGTH) {
// Content-Length // Content-Length
if let Ok(s) = len.to_str() { if let Ok(s) = len.to_str() {
if let Ok(len) = s.parse::<u64>() { if let Ok(len) = s.parse::<u64>() {
@ -599,7 +597,9 @@ impl Reader {
} else if chunked(&msg.get_mut().headers)? { } else if chunked(&msg.get_mut().headers)? {
// Chunked encoding // Chunked encoding
Some(Decoder::chunked()) Some(Decoder::chunked())
} else if msg.get_ref().headers.contains_key(header::UPGRADE) { } else if msg.get_ref().headers.contains_key(header::UPGRADE) ||
msg.get_ref().method == Method::CONNECT
{
Some(Decoder::eof()) Some(Decoder::eof())
} else { } else {
None None
@ -1227,8 +1227,7 @@ mod tests {
fn test_conn_upgrade_connect_method() { fn test_conn_upgrade_connect_method() {
let mut buf = Buffer::new( let mut buf = Buffer::new(
"CONNECT /test HTTP/1.1\r\n\ "CONNECT /test HTTP/1.1\r\n\
upgrade: websockets\r\n\ content-type: text/plain\r\n\r\n");
content-length: 0\r\n\r\n");
let req = parse_ready!(&mut buf); let req = parse_ready!(&mut buf);
assert!(req.upgrade()); assert!(req.upgrade());