Title: [227444] branches/safari-605-branch/Source/WebKit
- Revision
- 227444
- Author
- jmarc...@apple.com
- Date
- 2018-01-23 14:30:08 -0800 (Tue, 23 Jan 2018)
Log Message
Cherry-pick r227419. rdar://problem/36791643
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/WebKit/ChangeLog (227443 => 227444)
--- branches/safari-605-branch/Source/WebKit/ChangeLog 2018-01-23 22:14:41 UTC (rev 227443)
+++ branches/safari-605-branch/Source/WebKit/ChangeLog 2018-01-23 22:30:08 UTC (rev 227444)
@@ -1,3 +1,22 @@
+2018-01-23 Jason Marcell <jmarc...@apple.com>
+
+ Cherry-pick r227419. rdar://problem/36791643
+
+ 2018-01-23 Youenn Fablet <you...@apple.com>
+
+ REGRESSION (r227348): ASSERT_NOT_REACHED in WebKit::ServiceWorkerClientFetch::didFinish()
+ https://bugs.webkit.org/show_bug.cgi?id=181956
+ <rdar://problem/36755492>
+
+ Reviewed by Chris Dumez.
+
+ Covered by test no longer crashing in Debug builds.
+ Reset m_redirectionStatus to None when starting an SW fetch.
+
+ * WebProcess/Storage/ServiceWorkerClientFetch.cpp:
+ (WebKit::ServiceWorkerClientFetch::start):
+ (WebKit::ServiceWorkerClientFetch::didFinish):
+
2018-01-22 Jason Marcell <jmarc...@apple.com>
Cherry-pick r227358. rdar://problem/36763023
Modified: branches/safari-605-branch/Source/WebKit/WebProcess/Storage/ServiceWorkerClientFetch.cpp (227443 => 227444)
--- branches/safari-605-branch/Source/WebKit/WebProcess/Storage/ServiceWorkerClientFetch.cpp 2018-01-23 22:14:41 UTC (rev 227443)
+++ branches/safari-605-branch/Source/WebKit/WebProcess/Storage/ServiceWorkerClientFetch.cpp 2018-01-23 22:30:08 UTC (rev 227444)
@@ -73,6 +73,8 @@
ASSERT(options.serviceWorkersMode != ServiceWorkersMode::None);
m_connection->startFetch(m_loader->identifier(), options.serviceWorkerRegistrationIdentifier.value(), request, options, referrer);
+
+ m_redirectionStatus = RedirectionStatus::None;
}
// https://fetch.spec.whatwg.org/#http-fetch step 3.3
@@ -158,7 +160,6 @@
m_redirectionStatus = RedirectionStatus::Received;
return;
case RedirectionStatus::Following:
- m_redirectionStatus = RedirectionStatus::None;
start();
return;
case RedirectionStatus::Received:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
