Changeset 228078 in webkit

Timestamp:

Feb 4, 2018 9:30:56 PM (6 years ago)

Author:

jmarcell@apple.com

Message:

Cherry-pick r228041. rdar://problem/37220123

Location:

branches/safari-605-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/CacheStorageEngineCaches.cpp (modified) (2 diffs)

branches/safari-605-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2018-02-04  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r228041. rdar://problem/37220123
+
+    2018-02-02  Youenn Fablet  <youenn@apple.com>
+
+            CacheStorage should check for origin file presence when computing the origin of a folder
+            https://bugs.webkit.org/show_bug.cgi?id=182454
+
+            Reviewed by Chris Dumez.
+
+            In case caches is opened for an origin but no cache is added, we do not have a caches name file but we do have an origin filename.
+            We should be checking the origin filename anyway since we will be reading it afterwards.
+
+            * NetworkProcess/cache/CacheStorageEngineCaches.cpp:
+            (WebKit::CacheStorage::Caches::retrieveOriginFromDirectory):
+
 2018-02-04  Jason Marcell  <jmarcell@apple.com>
 

branches/safari-605-branch/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCaches.cpp

@@ -58 +58 @@
 void Caches::retrieveOriginFromDirectory(const String& folderPath, WorkQueue& queue, WTF::CompletionHandler<void(std::optional<WebCore::ClientOrigin>&&)>&& completionHandler)
 {
-    queue.dispatch([completionHandler = WTFMove(completionHandler), folderPath = folderPath.isolatedCopy()]() mutable {
-        if (!WebCore::FileSystem::fileExists(cachesListFilename(folderPath))) {
+    queue.dispatch([completionHandler = WTFMove(completionHandler), filename = cachesOriginFilename(folderPath)]() mutable {
+        if (!WebCore::FileSystem::fileExists(filename)) {
             RunLoop::main().dispatch([completionHandler = WTFMove(completionHandler)]() mutable {
                 completionHandler(std::nullopt);
@@ -66 +66 @@
         }
 
-        auto channel = IOChannel::open(cachesOriginFilename(folderPath), IOChannel::Type::Read);
+        auto channel = IOChannel::open(filename, IOChannel::Type::Read);
         channel->read(0, std::numeric_limits<size_t>::max(), nullptr, [completionHandler = WTFMove(completionHandler)](const Data& data, int error) mutable {
             ASSERT(RunLoop::isMain());