Fetch cancellation #19274
+98
−31
| @@ -1087,6 +1087,10 @@ fn http_network_fetch(request: &Request, | ||
| let devtools_sender = context.devtools_chan.clone(); | ||
| let meta_status = meta.status.clone(); | ||
| let meta_headers = meta.headers.clone(); | ||
| let cancellation_listener = context.cancellation_listener.clone(); | ||
| if cancellation_listener.lock().unwrap().cancelled() { | ||
| return Response::network_error(NetworkError::Internal("Fetch aborted".into())) | ||
| } | ||
| thread::Builder::new().name(format!("fetch worker thread")).spawn(move || { | ||
| match StreamedResponse::from_http_response(res) { | ||
| Ok(mut res) => { | ||
| @@ -1109,6 +1113,11 @@ fn http_network_fetch(request: &Request, | ||
| } | ||
|
|
||
| loop { | ||
| if cancellation_listener.lock().unwrap().cancelled() { | ||
| *res_body.lock().unwrap() = ResponseBody::Done(vec![]); | ||
|
||
| let _ = done_sender.send(Data::Cancelled); | ||
| return; | ||
| } | ||
| match read_block(&mut res) { | ||
| Ok(Data::Payload(chunk)) => { | ||
| if let ResponseBody::Receiving(ref mut body) = *res_body.lock().unwrap() { | ||
| @@ -1128,6 +1137,7 @@ fn http_network_fetch(request: &Request, | ||
| let _ = done_sender.send(Data::Done); | ||
| break; | ||
| } | ||
| Ok(Data::Cancelled) => unreachable!() // read_block doesn't return Data::Cancelled | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
ProTip!
Use n and p to navigate between commits in a pull request.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
In the context of #18676 I think that at this point the response would have been cached already, and such a cancellation would result in any subsequent request for the same url getting the empty cancelled response from the cache.
One way to solve this would be for the cache to disregard any cached responses that would have been cancelled. Checking for an empty response body might be one way to do so, perhaps a clearer way would be to use
ResponseBody::Emptyhere instead, or even introduce a newResponseBody::Cancelled?