<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[161109] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/161109">161109</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-28 00:36:24 -0800 (Sat, 28 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161108 => 161109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-27 22:05:05 UTC (rev 161108)
+++ trunk/Source/WebCore/ChangeLog 2013-12-28 08:36:24 UTC (rev 161109)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+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().
+
</ins><span class="cx"> 2013-12-27 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Another attempt to fix the Windows build after <http://trac.webkit.org/changeset/161106>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (161108 => 161109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2013-12-27 22:05:05 UTC (rev 161108)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2013-12-28 08:36:24 UTC (rev 161109)
</span><span class="lines">@@ -236,6 +236,7 @@
</span><span class="cx"> #if ENABLE(WEB_TIMING)
</span><span class="cx"> static int milisecondsSinceRequest(double requestTime);
</span><span class="cx"> #endif
</span><ins>+static void continueAfterDidReceiveResponse(ResourceHandle*);
</ins><span class="cx">
</span><span class="cx"> static bool gIgnoreSSLErrors = false;
</span><span class="cx">
</span><span class="lines">@@ -652,21 +653,14 @@
</span><span class="cx"> d->m_response.setURL(handle->firstRequest().url());
</span><span class="cx"> d->m_response.updateFromSoupMessageHeaders(soup_multipart_input_stream_get_headers(d->m_multipartInputStream.get()));
</span><span class="cx">
</span><ins>+ d->m_previousPosition = 0;
+
</ins><span class="cx"> if (handle->client()->usesAsyncCallbacks())
</span><span class="cx"> handle->client()->didReceiveResponseAsync(handle.get(), d->m_response);
</span><del>- else
</del><ins>+ else {
</ins><span class="cx"> handle->client()->didReceiveResponse(handle.get(), d->m_response);
</span><del>-
- if (handle->cancelledOrClientless()) {
- cleanupSoupRequestOperation(handle.get());
- return;
</del><ins>+ continueAfterDidReceiveResponse(handle.get());
</ins><span class="cx"> }
</span><del>-
- 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());
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void sendRequestCallback(GObject*, GAsyncResult* result, gpointer data)
</span><span class="lines">@@ -722,28 +716,37 @@
</span><span class="cx"> d->m_response.setExpectedContentLength(soup_request_get_content_length(d->m_soupRequest.get()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (soupMessage && d->m_response.isMultipart())
+ d->m_multipartInputStream = adoptGRef(soup_multipart_input_stream_new(soupMessage, inputStream.get()));
+ else
+ d->m_inputStream = inputStream;
+
</ins><span class="cx"> if (d->client()->usesAsyncCallbacks())
</span><span class="cx"> handle->client()->didReceiveResponseAsync(handle.get(), d->m_response);
</span><del>- else
</del><ins>+ else {
</ins><span class="cx"> handle->client()->didReceiveResponse(handle.get(), d->m_response);
</span><ins>+ continueAfterDidReceiveResponse(handle.get());
+ }
+}
</ins><span class="cx">
</span><ins>+static void continueAfterDidReceiveResponse(ResourceHandle* handle)
+{
</ins><span class="cx"> if (handle->cancelledOrClientless()) {
</span><del>- cleanupSoupRequestOperation(handle.get());
</del><ins>+ cleanupSoupRequestOperation(handle);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (soupMessage && d->m_response.isMultipart()) {
- d->m_multipartInputStream = adoptGRef(soup_multipart_input_stream_new(soupMessage, inputStream.get()));
</del><ins>+ ResourceHandleInternal* d = handle->getInternal();
+ if (d->m_soupMessage && d->m_multipartInputStream && !d->m_inputStream) {
</ins><span class="cx"> soup_multipart_input_stream_next_part_async(d->m_multipartInputStream.get(), G_PRIORITY_DEFAULT,
</span><del>- d->m_cancellable.get(), nextMultipartResponsePartCallback, handle.get());
</del><ins>+ d->m_cancellable.get(), nextMultipartResponsePartCallback, handle);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- d->m_inputStream = inputStream;
-
</del><ins>+ ASSERT(d->m_inputStream);
</ins><span class="cx"> handle->ensureReadBuffer();
</span><span class="cx"> g_input_stream_read_async(d->m_inputStream.get(), const_cast<char*>(d->m_soupBuffer->data), d->m_soupBuffer->length,
</span><del>- G_PRIORITY_DEFAULT, d->m_cancellable.get(), readCallback, handle.get());
</del><ins>+ G_PRIORITY_DEFAULT, d->m_cancellable.get(), readCallback, handle);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool addFileToSoupMessageBody(SoupMessage* message, const String& fileNameString, size_t offset, size_t lengthToSend, unsigned long& totalBodySize)
</span><span class="lines">@@ -1390,7 +1393,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(client());
</span><span class="cx"> ASSERT(client()->usesAsyncCallbacks());
</span><del>- // FIXME: Implement this method if needed: https://bugs.webkit.org/show_bug.cgi?id=126114.
</del><ins>+ continueAfterDidReceiveResponse(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceHandle::continueShouldUseCredentialStorage(bool)
</span></span></pre>
</div>
</div>
</body>
</html>