Changeset 161109 in webkit

Timestamp:

Dec 28, 2013 12:36:24 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Downloads are broken with the network process enabled
​https://bugs.webkit.org/show_bug.cgi?id=126131

Reviewed by Martin Robinson.

The problem is that the network process crashes when trying to
convert the handle to a download, because at that point the
download has finished and the handle is NULL. This happens because
we are not implementing ResourceHandle::continueDidReceiveResponse().

• platform/network/soup/ResourceHandleSoup.cpp:

(WebCore::nextMultipartResponsePartCallback): Call
continueAfterDidReceiveResponse() when not using async callbacks.
(WebCore::sendRequestCallback): Ditto.
(WebCore::continueAfterDidReceiveResponse): Helper function that
continues the load after didReceiveResponse.
(WebCore::ResourceHandle::continueDidReceiveResponse): Call
continueAfterDidReceiveResponse().

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/soup/ResourceHandleSoup.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-12-28  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Downloads are broken with the network process enabled
+        https://bugs.webkit.org/show_bug.cgi?id=126131
+
+        Reviewed by Martin Robinson.
+
+        The problem is that the network process crashes when trying to
+        convert the handle to a download, because at that point the
+        download has finished and the handle is NULL. This happens because
+        we are not implementing ResourceHandle::continueDidReceiveResponse().
+
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::nextMultipartResponsePartCallback): Call
+        continueAfterDidReceiveResponse() when not using async callbacks.
+        (WebCore::sendRequestCallback): Ditto.
+        (WebCore::continueAfterDidReceiveResponse): Helper function that
+        continues the load after didReceiveResponse.
+        (WebCore::ResourceHandle::continueDidReceiveResponse): Call
+        continueAfterDidReceiveResponse().
+
 2013-12-27  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp

@@ -237 +237 @@
 static int  milisecondsSinceRequest(double requestTime);
 #endif
+static void continueAfterDidReceiveResponse(ResourceHandle*);
 
 static bool gIgnoreSSLErrors = false;
@@ -653 +654 @@
     d->m_response.updateFromSoupMessageHeaders(soup_multipart_input_stream_get_headers(d->m_multipartInputStream.get()));
 
+    d->m_previousPosition = 0;
+
     if (handle->client()->usesAsyncCallbacks())
         handle->client()->didReceiveResponseAsync(handle.get(), d->m_response);
-    else
+    else {
         handle->client()->didReceiveResponse(handle.get(), d->m_response);
-
-    if (handle->cancelledOrClientless()) {
-        cleanupSoupRequestOperation(handle.get());
-        return;
-    }
-
-    d->m_previousPosition = 0;
-
-    handle->ensureReadBuffer();
-    g_input_stream_read_async(d->m_inputStream.get(), const_cast<char*>(d->m_soupBuffer->data), d->m_soupBuffer->length,
-        G_PRIORITY_DEFAULT, d->m_cancellable.get(), readCallback, handle.get());
+        continueAfterDidReceiveResponse(handle.get());
+    }
 }
 
@@ -723 +717 @@
     }
 
+    if (soupMessage && d->m_response.isMultipart())
+        d->m_multipartInputStream = adoptGRef(soup_multipart_input_stream_new(soupMessage, inputStream.get()));
+    else
+        d->m_inputStream = inputStream;
+
     if (d->client()->usesAsyncCallbacks())
         handle->client()->didReceiveResponseAsync(handle.get(), d->m_response);
-    else
+    else {
         handle->client()->didReceiveResponse(handle.get(), d->m_response);
-
+        continueAfterDidReceiveResponse(handle.get());
+    }
+}
+
+static void continueAfterDidReceiveResponse(ResourceHandle* handle)
+{
     if (handle->cancelledOrClientless()) {
-        cleanupSoupRequestOperation(handle.get());
-        return;
-    }
-
-    if (soupMessage && d->m_response.isMultipart()) {
-        d->m_multipartInputStream = adoptGRef(soup_multipart_input_stream_new(soupMessage, inputStream.get()));
+        cleanupSoupRequestOperation(handle);
+        return;
+    }
+
+    ResourceHandleInternal* d = handle->getInternal();
+    if (d->m_soupMessage && d->m_multipartInputStream && !d->m_inputStream) {
         soup_multipart_input_stream_next_part_async(d->m_multipartInputStream.get(), G_PRIORITY_DEFAULT,
-            d->m_cancellable.get(), nextMultipartResponsePartCallback, handle.get());
-        return;
-    }
-
-    d->m_inputStream = inputStream;
-
+            d->m_cancellable.get(), nextMultipartResponsePartCallback, handle);
+        return;
+    }
+
+    ASSERT(d->m_inputStream);
     handle->ensureReadBuffer();
     g_input_stream_read_async(d->m_inputStream.get(), const_cast<char*>(d->m_soupBuffer->data), d->m_soupBuffer->length,
-        G_PRIORITY_DEFAULT, d->m_cancellable.get(), readCallback, handle.get());
+        G_PRIORITY_DEFAULT, d->m_cancellable.get(), readCallback, handle);
 }
 
@@ -1391 +1394 @@
     ASSERT(client());
     ASSERT(client()->usesAsyncCallbacks());
-    // FIXME: Implement this method if needed: https://bugs.webkit.org/show_bug.cgi?id=126114.
+    continueAfterDidReceiveResponse(this);
 }