Title: [210713] branches/safari-603-branch/Source/WebCore
- Revision
- 210713
- Author
- matthew_han...@apple.com
- Date
- 2017-01-12 22:10:40 -0800 (Thu, 12 Jan 2017)
Log Message
Merge r210679. rdar://problem/29910273
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (210712 => 210713)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-13 06:10:37 UTC (rev 210712)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-13 06:10:40 UTC (rev 210713)
@@ -1,5 +1,22 @@
2017-01-12 Matthew Hanson <matthew_han...@apple.com>
+ Merge r210679. rdar://problem/29910273
+
+ 2017-01-12 Youenn Fablet <you...@apple.com>
+
+ OneDrive application crashes upon launch
+ https://bugs.webkit.org/show_bug.cgi?id=166975
+
+ Reviewed by Brady Eidson.
+
+ Checking whether load is terminated just after calling ResourceLoader::willSendRequestInternal.
+ The reason is that delegate call may actually cancel the load at that point.
+
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::willSendRequestInternal):
+
+2017-01-12 Matthew Hanson <matthew_han...@apple.com>
+
Merge r210677. rdar://problem/21482487
2017-01-12 Jer Noble <jer.no...@apple.com>
Modified: branches/safari-603-branch/Source/WebCore/loader/SubresourceLoader.cpp (210712 => 210713)
--- branches/safari-603-branch/Source/WebCore/loader/SubresourceLoader.cpp 2017-01-13 06:10:37 UTC (rev 210712)
+++ branches/safari-603-branch/Source/WebCore/loader/SubresourceLoader.cpp 2017-01-13 06:10:40 UTC (rev 210713)
@@ -231,6 +231,10 @@
return;
ResourceLoader::willSendRequestInternal(newRequest, redirectResponse);
+
+ if (reachedTerminalState())
+ return;
+
if (newRequest.isNull()) {
cancel();
return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
