Title: [184388] releases/WebKitGTK/webkit-2.8/Source/WebKit2
- Revision
- 184388
- Author
- [email protected]
- Date
- 2015-05-15 05:56:19 -0700 (Fri, 15 May 2015)
Log Message
REGRESSION(r183861): [SOUP] Downloads are broken when using the Network Process
https://bugs.webkit.org/show_bug.cgi?id=144738
When converting the main resource handle to a download, the
NetworkResourceLoader is aborted, but the ResourceHandle shouldn't
be cleaned up because it's still used for the download.
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::cleanup):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog (184387 => 184388)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-05-15 12:49:06 UTC (rev 184387)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-05-15 12:56:19 UTC (rev 184388)
@@ -1,3 +1,15 @@
+2015-05-14 Carlos Garcia Campos <[email protected]>
+
+ REGRESSION(r183861): [SOUP] Downloads are broken when using the Network Process
+ https://bugs.webkit.org/show_bug.cgi?id=144738
+
+ When converting the main resource handle to a download, the
+ NetworkResourceLoader is aborted, but the ResourceHandle shouldn't
+ be cleaned up because it's still used for the download.
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::cleanup):
+
2015-05-14 Zan Dobersek <[email protected]>
[GTK] Add missing ENABLE(NETSCAPE_PLUGIN_API) build guards
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (184387 => 184388)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2015-05-15 12:49:06 UTC (rev 184387)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2015-05-15 12:56:19 UTC (rev 184388)
@@ -206,10 +206,9 @@
NetworkProcess::singleton().networkResourceLoadScheduler().removeLoader(this);
- if (m_handle) {
+ if (m_handle && !m_didConvertHandleToDownload)
m_handle->setClient(nullptr);
- m_handle = nullptr;
- }
+ m_handle = nullptr;
// This will cause NetworkResourceLoader to be destroyed and therefore we do it last.
m_connection->didCleanupResourceLoader(*this);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
