fix(fetch): return null bodies for HEAD and bodyless statuses

Carry request methods through buffered, streaming, Worker, and navigation
preload response creation. Discard public and filtered internal bodies before
registering streams, so null bodies remain reusable through reads, clones,
and aborts while empty GET responses keep their streams.

Cover real HTTP responses in Window, iframe, and Worker and verify pending
body sources do not retain late chunks or terminal events.

Validation: cargo fmt --all; workspace Clippy with all targets/features and
-D warnings; nextest 17,940 passed, 13 skipped. Focused WPT comparison gained
2 complete cases and 20 subtests across 69 cases with no new failures.
This commit is contained in:
ldm0
2026-11-02 06:02:17 +08:00
parent 9c025e6130
commit 2da3b2c42e
2 changed files with 70 additions and 0 deletions
@@ -6114,6 +6114,8 @@ encoding/utf-32-from-win1252.html
encoding/utf-32.html
event-timing/supported-types-consistent-with-self.html
fetch/api/abort/destroyed-context.html
fetch/api/basic/response-null-body.any.js?moli-wpt-any=dedicatedworker
fetch/api/basic/response-null-body.any.js?moli-wpt-any=window
fetch/api/cors/data-url-iframe.html
fetch/api/cors/data-url-shared-worker.html
fetch/api/cors/data-url-worker.html
+68
View File
@@ -1,5 +1,73 @@
use super::*;
#[tokio::test(flavor = "multi_thread")]
async fn fetched_null_bodies_stay_unused_through_consumption_cloning_and_abort() -> Result<()> {
use tokio::io::{AsyncReadExt, AsyncWriteExt};
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await?;
let response_url = format!("http://{}/", listener.local_addr()?);
let mut tasks = tokio::task::JoinSet::new();
tasks.spawn(async move {
let mut connections = tokio::task::JoinSet::new();
while let Ok((mut stream, _)) = listener.accept().await {
connections.spawn(async move {
let mut request = Vec::new();
let mut buffer = [0u8; 1024];
while !request.windows(4).any(|bytes| bytes == b"\r\n\r\n") {
let len = stream.read(&mut buffer).await.unwrap();
if len == 0 {
return;
}
request.extend_from_slice(&buffer[..len]);
assert!(request.len() < 8192, "unexpectedly large request headers");
}
let request = String::from_utf8(request).unwrap();
let preflight = request.lines().any(|line| {
line.to_ascii_lowercase().starts_with("access-control-request-method:")
});
let mut fields = request.split_whitespace();
let method = fields.next().unwrap();
let url = url::Url::parse(&format!("http://fixture{}", fields.next().unwrap())).unwrap();
let code = url.query_pairs().find(|(name, _)| name == "code")
.map(|(_, value)| value.into_owned()).unwrap();
let code = if preflight { "204" } else { &code };
let empty = url.query_pairs().any(|(name, value)| name == "empty" && value == "1");
let body = if empty || preflight { "" } else { "name=value" };
let head = format!(
"HTTP/1.1 {code} Test\r\nContent-Type: application/x-www-form-urlencoded\r\nAccess-Control-Allow-Origin: *\r\nAccess-Control-Allow-Methods: GET, HEAD, POST, OPTIONS\r\nContent-Length: {}\r\nConnection: close\r\n\r\n",
body.len(),
);
if stream.write_all(head.as_bytes()).await.is_ok() && method != "HEAD" {
// Intentionally send bytes for null-body statuses as WPT's
// status.py does. Delay 205 so abort can race the transport.
if code == "205" {
tokio::time::sleep(Duration::from_millis(100)).await;
}
let _ = stream.write_all(body.as_bytes()).await;
}
});
}
});
let server = FixtureServer::spawn().await?;
let browser = Browser::new(AppConfig::default())?;
let source = format!(
"{}\nrunFetchedNullBodyProbe({}).then(finish, error => finish({{error: String(error)}}));",
include_str!("../fixtures/runtime/fetched_null_body.js"),
serde_json::to_string(&response_url)?,
);
for target in ["window", "child", "worker"] {
let observed = tokio::time::timeout(
Duration::from_secs(20),
super::event_dispatch::run_probe(&browser, &server, target, &source),
)
.await??;
assert_eq!(observed, serde_json::json!({"errors": []}), "{target}");
}
server.shutdown().await;
tasks.shutdown().await;
Ok(())
}
async fn assert_body_consumption_state(scenario: &str) -> Result<()> {
let server = FixtureServer::spawn().await?;
let browser = Browser::new(AppConfig::default())?;