diff options
| author | Patrick Griffis <pgriffis@igalia.com> | 2023-04-29 12:47:45 -0500 |
|---|---|---|
| committer | Patrick Griffis <pgriffis@igalia.com> | 2023-04-29 12:47:45 -0500 |
| commit | 23de26a1b03c6dcfae92c615d4aecc15510e5705 (patch) | |
| tree | e6d55b9594695493356723f23d2f500138b1f1be /libsoup | |
| parent | 35f4efe732ea80bdacc2afb46e4f3d7bf6df31e9 (diff) | |
| download | libsoup-23de26a1b03c6dcfae92c615d4aecc15510e5705.tar.gz | |
Revert "session: handle request cancellation earlier"
This reverts commit 517eb93f33e3d5dcf7ba059608114fc9e36b62af.
Diffstat (limited to 'libsoup')
| -rw-r--r-- | libsoup/soup-session.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c index e9285a97..1020feed 100644 --- a/libsoup/soup-session.c +++ b/libsoup/soup-session.c @@ -1740,9 +1740,6 @@ 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)) @@ -2910,8 +2907,7 @@ 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); - if (data->item->state != SOUP_MESSAGE_FINISHED) - cancel_cache_response (data->item); + cancel_cache_response (data->item); async_cache_conditional_data_free (data); return; } |