fix(http): no longer keep alive for Http1.0 if no Connection header

Closes #596
This commit is contained in:
Sean McArthur
2015-07-06 12:55:25 -07:00
parent 7c2e5124e6
commit ddecb262b3

View File

@@ -22,8 +22,25 @@ pub struct RawStatus(pub u16, pub Cow<'static, str>);
pub fn should_keep_alive(version: HttpVersion, headers: &Headers) -> bool { pub fn should_keep_alive(version: HttpVersion, headers: &Headers) -> bool {
trace!("should_keep_alive( {:?}, {:?} )", version, headers.get::<Connection>()); trace!("should_keep_alive( {:?}, {:?} )", version, headers.get::<Connection>());
match (version, headers.get::<Connection>()) { match (version, headers.get::<Connection>()) {
(Http10, None) => false,
(Http10, Some(conn)) if !conn.contains(&KeepAlive) => false, (Http10, Some(conn)) if !conn.contains(&KeepAlive) => false,
(Http11, Some(conn)) if conn.contains(&Close) => false, (Http11, Some(conn)) if conn.contains(&Close) => false,
_ => true _ => true
} }
} }
#[test]
fn test_should_keep_alive() {
let mut headers = Headers::new();
assert!(!should_keep_alive(Http10, &headers));
assert!(should_keep_alive(Http11, &headers));
headers.set(Connection::close());
assert!(!should_keep_alive(Http10, &headers));
assert!(!should_keep_alive(Http11, &headers));
headers.set(Connection::keep_alive());
assert!(should_keep_alive(Http10, &headers));
assert!(should_keep_alive(Http11, &headers));
}