Changeset 181895 in webkit

Timestamp:

Mar 24, 2015, 9:50:55 AM (11 years ago)

Author:

Chris Dumez

Message:

[WK2] NetworkCache retrievals fail for entries with no body
​https://bugs.webkit.org/show_bug.cgi?id=142979
<rdar://problem/20264100>

Reviewed by Antti Koivisto.

Source/WebKit2:

NetworkCache retrievals were failing for entries with no body because
decodeEntry() doesn't correctly handle this case. In particular, the
following check fails:
"metaData.bodyOffset + metaData.bodySize == fileData.size()".
This is because bodyOffset is pageSize-aligned.

As a result, the following resource on apple.com is stored in the cache
but we fail to reuse it and reload it from the network every time:
​http://images.apple.com/home/styles/promos.css

This patch updates decodeEntry() to create a null Data object for the
body if bodySize is 0.

• NetworkProcess/cache/NetworkCacheDataCocoa.mm:

(WebKit::NetworkCache::Data::data):
Do not attempt to initialize m_data if m_dispatchData is null as the
call to dispatch_data_create_map() would then crash. We now return
null in this case. This is needed as decodeStorageEntry() in
NetworkCache.cpp constructs a SharedBuffer from
storageEntry.body.data() and the body may be null.

• NetworkProcess/cache/NetworkCacheStorage.cpp:

(WebKit::NetworkCache::decodeEntry):

LayoutTests:

Add network disk cache validation test for resources that have no body
(only headers).

• http/tests/cache/disk-cache/disk-cache-validation-no-body-expected.txt: Added.
• http/tests/cache/disk-cache/disk-cache-validation-no-body.html: Added.
• http/tests/cache/disk-cache/resources/generate-response-no-body.cgi: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/cache/disk-cache/disk-cache-validation-no-body-expected.txt (added)
• LayoutTests/http/tests/cache/disk-cache/disk-cache-validation-no-body.html (added)
• LayoutTests/http/tests/cache/disk-cache/resources/generate-response-no-body.cgi (added)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/NetworkProcess/cache/NetworkCacheDataCocoa.mm (modified) (1 diff)
• Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-03-24  Chris Dumez  <cdumez@apple.com>
+
+        [WK2] NetworkCache retrievals fail for entries with no body
+        https://bugs.webkit.org/show_bug.cgi?id=142979
+        <rdar://problem/20264100>
+
+        Reviewed by Antti Koivisto.
+
+        Add network disk cache validation test for resources that have no body
+        (only headers).
+
+        * http/tests/cache/disk-cache/disk-cache-validation-no-body-expected.txt: Added.
+        * http/tests/cache/disk-cache/disk-cache-validation-no-body.html: Added.
+        * http/tests/cache/disk-cache/resources/generate-response-no-body.cgi: Added.
+
 2015-03-24  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-24  Chris Dumez  <cdumez@apple.com>
+
+        [WK2] NetworkCache retrievals fail for entries with no body
+        https://bugs.webkit.org/show_bug.cgi?id=142979
+        <rdar://problem/20264100>
+
+        Reviewed by Antti Koivisto.
+
+        NetworkCache retrievals were failing for entries with no body because
+        decodeEntry() doesn't correctly handle this case. In particular, the
+        following check fails:
+        "metaData.bodyOffset + metaData.bodySize == fileData.size()".
+        This is because bodyOffset is pageSize-aligned.
+
+        As a result, the following resource on apple.com is stored in the cache
+        but we fail to reuse it and reload it from the network every time:
+        http://images.apple.com/home/styles/promos.css
+
+        This patch updates decodeEntry() to create a null Data object for the
+        body if bodySize is 0.
+
+        * NetworkProcess/cache/NetworkCacheDataCocoa.mm:
+        (WebKit::NetworkCache::Data::data):
+        Do not attempt to initialize m_data if m_dispatchData is null as the
+        call to dispatch_data_create_map() would then crash. We now return
+        null in this case. This is needed as decodeStorageEntry() in
+        NetworkCache.cpp constructs a SharedBuffer from
+        storageEntry.body.data() and the body may be null.
+
+        * NetworkProcess/cache/NetworkCacheStorage.cpp:
+        (WebKit::NetworkCache::decodeEntry):
+
 2015-03-24  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataCocoa.mm

@@ -50 +50 @@
 const uint8_t* Data::data() const
 {
-    if (!m_data) {
+    if (!m_data && m_dispatchData) {
         const void* data;
         size_t size;

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp

@@ -213 +213 @@
     if (metaData.key != key)
         return nullptr;
-    if (metaData.bodyOffset + metaData.bodySize != fileData.size())
-        return nullptr;
-
-    auto bodyData = mapFile(fd, metaData.bodyOffset, metaData.bodySize);
-    if (bodyData.isNull()) {
-        LOG(NetworkCacheStorage, "(NetworkProcess) map failed");
-        return nullptr;
-    }
-
-    if (metaData.bodyChecksum != hashData(bodyData)) {
-        LOG(NetworkCacheStorage, "(NetworkProcess) data checksum mismatch");
-        return nullptr;
+
+    Data bodyData;
+    if (metaData.bodySize) {
+        if (metaData.bodyOffset + metaData.bodySize != fileData.size())
+            return nullptr;
+
+        bodyData = mapFile(fd, metaData.bodyOffset, metaData.bodySize);
+        if (bodyData.isNull()) {
+            LOG(NetworkCacheStorage, "(NetworkProcess) map failed");
+            return nullptr;
+        }
+
+        if (metaData.bodyChecksum != hashData(bodyData)) {
+            LOG(NetworkCacheStorage, "(NetworkProcess) data checksum mismatch");
+            return nullptr;
+        }
     }