From 517eb93f33e3d5dcf7ba059608114fc9e36b62af Mon Sep 17 00:00:00 2001 From: Carlos Garcia Campos Date: Sat, 8 Apr 2023 09:15:59 +0200 Subject: session: handle request cancellation earlier Check if the message was cancelled on every queue state loop iteration. --- libsoup/soup-session.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libsoup') diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c index 4d4c8654..5acf60a8 100644 --- a/libsoup/soup-session.c +++ b/libsoup/soup-session.c @@ -1740,6 +1740,9 @@ soup_session_process_queue_item (SoupSession *session, if (item->paused) return; + if (item->state != SOUP_MESSAGE_FINISHING && g_cancellable_is_cancelled (item->cancellable)) + item->state = SOUP_MESSAGE_FINISHING; + switch (item->state) { case SOUP_MESSAGE_STARTING: if (!soup_session_ensure_item_connection (session, item)) @@ -2907,7 +2910,8 @@ conditional_get_ready_cb (SoupSession *session, stream = soup_session_send_finish (session, result, &error); if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { soup_cache_cancel_conditional_request (data->cache, data->conditional_msg); - cancel_cache_response (data->item); + if (data->item->state != SOUP_MESSAGE_FINISHED) + cancel_cache_response (data->item); async_cache_conditional_data_free (data); return; } -- cgit v1.2.1