[evolution/gnome-3-16] [EHTTPRequest] Immediately cancel ongoing download on request cancel

[Milan Crha <mcrha src gnome org>]

commit 602133162bfd50f2ea7b9e74f032bd69cf12c0b9
Author: Milan Crha <mcrha redhat com>
Date:   Fri Apr 3 08:27:10 2015 +0200

    [EHTTPRequest] Immediately cancel ongoing download on request cancel
    
    No need to continue any download when the request had been cancelled.
    This could cause starving of other requests with download of large images.

 mail/e-http-request.c |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/mail/e-http-request.c b/mail/e-http-request.c
index e8b2a2b..5453c54 100644
--- a/mail/e-http-request.c
+++ b/mail/e-http-request.c
@@ -156,6 +156,13 @@ send_and_handle_redirection (SoupSession *session,
 }
 
 static void
+http_request_cancelled_cb (GCancellable *cancellable,
+                          SoupSession *session)
+{
+       soup_session_abort (session);
+}
+
+static void
 handle_http_request (GSimpleAsyncResult *res,
                      GObject *source_object,
                      GCancellable *cancellable)
@@ -360,6 +367,10 @@ handle_http_request (GSimpleAsyncResult *res,
                GIOStream *cache_stream;
                GError *error;
                GMainContext *context;
+               gulong cancelled_id = 0;
+
+               if (g_cancellable_is_cancelled (cancellable))
+                       goto cleanup;
 
                message = soup_message_new (SOUP_METHOD_GET, uri);
                if (!message) {
@@ -382,8 +393,14 @@ handle_http_request (GSimpleAsyncResult *res,
                        message->request_headers,
                        "User-Agent", "Evolution/" VERSION);
 
+               if (cancellable)
+                       cancelled_id = g_cancellable_connect (cancellable, G_CALLBACK 
(http_request_cancelled_cb), temp_session, NULL);
+
                send_and_handle_redirection (temp_session, message, NULL);
 
+               if (cancellable && cancelled_id)
+                       g_cancellable_disconnect (cancellable, cancelled_id);
+
                if (!SOUP_STATUS_IS_SUCCESSFUL (message->status_code)) {
                        g_debug ("Failed to request %s (code %d)", uri, message->status_code);
                        g_object_unref (message);