Title: [137777] tags/Safari-537.21.1/Source/WebCore
- Revision
- 137777
- Author
- [email protected]
- Date
- 2012-12-14 14:57:48 -0800 (Fri, 14 Dec 2012)
Log Message
Merged r137763. <rdar://problem/12879657>
Modified Paths
Diff
Modified: tags/Safari-537.21.1/Source/WebCore/ChangeLog (137776 => 137777)
--- tags/Safari-537.21.1/Source/WebCore/ChangeLog 2012-12-14 22:55:27 UTC (rev 137776)
+++ tags/Safari-537.21.1/Source/WebCore/ChangeLog 2012-12-14 22:57:48 UTC (rev 137777)
@@ -1,3 +1,20 @@
+2012-12-14 Lucas Forschler <[email protected]>
+
+ Merge r137763
+
+ 2012-12-14 Anders Carlsson <[email protected]>
+
+ REGRESSION (r137607): Cannot download files, stuck in "Preparing to download"
+ https://bugs.webkit.org/show_bug.cgi?id=105044
+ <rdar://problem/12879657>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Make ResourceHandle::cancel return early if the handle has been converted to a download.
+
+ * platform/network/mac/ResourceHandleMac.mm:
+ (WebCore::ResourceHandle::cancel):
+
2012-12-13 Lucas Forschler <[email protected]>
Merge r137573
Modified: tags/Safari-537.21.1/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (137776 => 137777)
--- tags/Safari-537.21.1/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2012-12-14 22:55:27 UTC (rev 137776)
+++ tags/Safari-537.21.1/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2012-12-14 22:57:48 UTC (rev 137777)
@@ -288,6 +288,12 @@
{
LOG(Network, "Handle %p cancel connection %p", this, d->m_connection.get());
+ if (!d->m_proxy) {
+ // If the proxy is null, the connection has been handed off to NSURLDownload, so ResourceHandle should not cancel it.
+ // FIXME: We should do what we do in the CFNetwork port and null out the NSURLConnection object instead.
+ return;
+ }
+
// Leaks were seen on HTTP tests without this; can be removed once <rdar://problem/6886937> is fixed.
if (d->m_currentMacChallenge)
[[d->m_currentMacChallenge sender] cancelAuthenticationChallenge:d->m_currentMacChallenge];
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
