Skip to content

Commit

Permalink
fix(http1): fix intermitent panic parsing partial headers (#3812)
Browse files Browse the repository at this point in the history
Closes #3811
  • Loading branch information
seanmonstar committed Dec 16, 2024
1 parent a24f0c0 commit 4c619f3
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/proto/h1/io.rs
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,11 @@ where
}
}
if curr_len > 0 {
trace!("partial headers; {} bytes so far", curr_len);
self.partial_len = Some(curr_len);
} else {
// 1xx gobled some bytes
self.partial_len = None;
}
}
}
Expand Down
57 changes: 57 additions & 0 deletions tests/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2908,6 +2908,63 @@ mod conn {
assert_eq!(vec, b"bar=foo");
}

#[tokio::test]
async fn client_100_then_http09() {
let _ = ::pretty_env_logger::try_init();

let server = TcpListener::bind("127.0.0.1:0").unwrap();
let addr = server.local_addr().unwrap();

thread::spawn(move || {
let mut sock = server.accept().unwrap().0;
sock.set_read_timeout(Some(Duration::from_secs(5))).unwrap();
sock.set_write_timeout(Some(Duration::from_secs(5)))
.unwrap();
let mut buf = [0; 4096];
sock.read(&mut buf).expect("read 1");
sock.write_all(
b"\
HTTP/1.1 100 Continue\r\n\
Content-Type: text/plain\r\n\
Server: BaseHTTP/0.6 Python/3.12.5\r\n\
Date: Mon, 16 Dec 2024 03:08:27 GMT\r\n\
",
)
.unwrap();
// That it's separate writes is important to this test
thread::sleep(Duration::from_millis(50));
sock.write_all(
b"\
\r\n\
",
)
.expect("write 2");
thread::sleep(Duration::from_millis(50));
sock.write_all(
b"\
This is a sample text/plain document, without final headers.\
\n\n\
",
)
.expect("write 3");
});

let tcp = tcp_connect(&addr).await.unwrap();

let (mut client, conn) = conn::Builder::new()
.http09_responses(true)
.handshake(tcp)
.await
.unwrap();

tokio::spawn(async move {
let _ = conn.await;
});

let req = Request::builder().uri("/a").body(Body::empty()).unwrap();
let _res = client.send_request(req).await.expect("send_request");
}

#[tokio::test]
async fn http2_detect_conn_eof() {
use futures_util::future;
Expand Down

0 comments on commit 4c619f3

Please sign in to comment.