Changeset 184690 in webkit

Timestamp:

May 20, 2015 7:09:14 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

Enable disk cache for range requests
​https://bugs.webkit.org/show_bug.cgi?id=144682

Patch by Marcos Chavarría Teijeiro <​mchavarria@igalia.com> on 2015-05-20
Reviewed by Antti Koivisto.

Source/WebKit2:

Add Range header value to the network cache key constructor so we take
into account this value. The 206 response code is also marked to be cached.

• NetworkProcess/cache/NetworkCache.cpp:

(WebKit::NetworkCache::makeCacheKey):
(WebKit::NetworkCache::isStatusCodeCacheableByDefault):

• NetworkProcess/cache/NetworkCacheKey.cpp:

(WebKit::NetworkCache::Key::Key):
(WebKit::NetworkCache::Key::operator=):
(WebKit::NetworkCache::Key::computeHash):
(WebKit::NetworkCache::Key::operator==):
(WebKit::NetworkCache::Key::encode):
(WebKit::NetworkCache::Key::decode):
(WebKit::NetworkCache::Key::stringToHash): Deleted.

• NetworkProcess/cache/NetworkCacheKey.h:

LayoutTests:

• http/tests/cache/disk-cache/disk-cache-range-expected.txt: Added. Add Test.
• http/tests/cache/disk-cache/disk-cache-range.html: Added.
• http/tests/cache/disk-cache/resources/generate-response.cgi: Modify script to return 206 and 416 response codes if Range header is present.
• platform/gtk/TestExpectations: Remove failing test.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/cache/disk-cache/disk-cache-range-expected.txt (added)
• LayoutTests/http/tests/cache/disk-cache/disk-cache-range.html (added)
• LayoutTests/http/tests/cache/disk-cache/resources/generate-response.cgi (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (modified) (2 diffs)
• Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp (modified) (7 diffs)
• Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-05-20  Marcos Chavarría Teijeiro  <mchavarria@igalia.com>
+
+        Enable disk cache for range requests
+        https://bugs.webkit.org/show_bug.cgi?id=144682
+
+        Reviewed by Antti Koivisto.
+
+        * http/tests/cache/disk-cache/disk-cache-range-expected.txt: Added. Add Test.
+        * http/tests/cache/disk-cache/disk-cache-range.html: Added.
+        * http/tests/cache/disk-cache/resources/generate-response.cgi: Modify script to return 206 and 416 response codes if Range header is present.
+        * platform/gtk/TestExpectations: Remove failing test.
+
 2015-05-20  Chris Fleizach  <cfleizach@apple.com>
 

trunk/LayoutTests/http/tests/cache/disk-cache/resources/generate-response.cgi

@@ -20 +20 @@
 }
 
+if ($query->http && $query->param("Range") =~ /bytes=(\d+)-(\d+)/) {
+
+    if ($1 < 6 && $2 < 6) {
+        print "Status: 206\n";
+    } else {
+        print "Status: 416\n";
+    }
+
+    $hasStatusCode = 1;
+}
+
 foreach (@names) {
     next if ($_ eq "uniqueId");

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -2293 +2293 @@
 webkit.org/b/144763 fast/events/scroll-in-scaled-page-with-overflow-hidden.html
 
-webkit.org/b/144682 http/tests/xmlhttprequest/range-test.html [ Failure ]
-
 webkit.org/b/141835 media/video-controls-no-scripting.html [ Failure ]
 webkit.org/b/145048 http/tests/misc/bad-charset-alias.html [ Failure ]

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-05-20  Marcos Chavarría Teijeiro  <mchavarria@igalia.com>
+
+        Enable disk cache for range requests
+        https://bugs.webkit.org/show_bug.cgi?id=144682
+
+        Reviewed by Antti Koivisto.
+
+        Add Range header value to the network cache key constructor so we take
+        into account this value. The 206 response code is also marked to be cached.
+
+        * NetworkProcess/cache/NetworkCache.cpp:
+        (WebKit::NetworkCache::makeCacheKey):
+        (WebKit::NetworkCache::isStatusCodeCacheableByDefault):
+        * NetworkProcess/cache/NetworkCacheKey.cpp:
+        (WebKit::NetworkCache::Key::Key):
+        (WebKit::NetworkCache::Key::operator=):
+        (WebKit::NetworkCache::Key::computeHash):
+        (WebKit::NetworkCache::Key::operator==):
+        (WebKit::NetworkCache::Key::encode):
+        (WebKit::NetworkCache::Key::decode):
+        (WebKit::NetworkCache::Key::stringToHash): Deleted.
+        * NetworkProcess/cache/NetworkCacheKey.h:
+
 2015-05-20  Anders Carlsson  <andersca@apple.com>
 

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

@@ -110 +110 @@
     if (partition.isEmpty())
         partition = ASCIILiteral("No partition");
-    return { request.httpMethod(), partition, request.url().string()  };
+
+    // FIXME: This implements minimal Range header disk cache support. We don't parse
+    // ranges so only the same exact range request will be served from the cache.
+    String range = request.httpHeaderField(WebCore::HTTPHeaderName::Range);
+    return { request.httpMethod(), partition, range, request.url().string()  };
 }
 
@@ -238 +242 @@
     case 203: // Non-Authoritative Information
     case 204: // No Content
+    case 206: // Partial Content
     case 300: // Multiple Choices
     case 301: // Moved Permanently

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

@@ -41 +41 @@
     , m_partition(o.m_partition.isolatedCopy())
     , m_identifier(o.m_identifier.isolatedCopy())
+    , m_range(o.m_range.isolatedCopy())
     , m_hash(o.m_hash)
 {
 }
 
-Key::Key(const String& method, const String& partition, const String& identifier)
+Key::Key(const String& method, const String& partition, const String& range, const String& identifier)
     : m_method(method.isolatedCopy())
     , m_partition(partition.isolatedCopy())
     , m_identifier(identifier.isolatedCopy())
+    , m_range(range.isolatedCopy())
     , m_hash(computeHash())
 {
@@ -58 +60 @@
     m_partition = other.m_partition.isolatedCopy();
     m_identifier = other.m_identifier.isolatedCopy();
+    m_range = other.m_range.isolatedCopy();
     m_hash = other.m_hash;
     return *this;
@@ -65 +68 @@
 {
     const uint8_t zero = 0;
+
+    if (string.isNull())
+        return;
+
     if (string.is8Bit() && string.containsOnlyASCII()) {
         md5.addBytes(string.characters8(), string.length());
@@ -83 +90 @@
     hashString(md5, m_partition);
     hashString(md5, m_identifier);
+    hashString(md5, m_range);
     MD5::Digest hash;
     md5.checksum(hash);
@@ -122 +130 @@
 bool Key::operator==(const Key& other) const
 {
-    return m_hash == other.m_hash && m_method == other.m_method && m_partition == other.m_partition && m_identifier == other.m_identifier;
+    return m_hash == other.m_hash && m_method == other.m_method && m_partition == other.m_partition && m_identifier == other.m_identifier && m_range == other.m_range;
 }
 
@@ -130 +138 @@
     encoder << m_partition;
     encoder << m_identifier;
+    encoder << m_range;
     encoder << m_hash;
 }
@@ -135 +144 @@
 bool Key::decode(Decoder& decoder, Key& key)
 {
-    return decoder.decode(key.m_method) && decoder.decode(key.m_partition) && decoder.decode(key.m_identifier) && decoder.decode(key.m_hash);
+    return decoder.decode(key.m_method) && decoder.decode(key.m_partition) && decoder.decode(key.m_identifier) && decoder.decode(key.m_range) && decoder.decode(key.m_hash);
 }
 

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h

@@ -45 +45 @@
     Key(const Key&);
     Key(Key&&) = default;
-    Key(const String& method, const String& partition, const String& identifier);
+    Key(const String& method, const String& partition, const String& range, const String& identifier);
 
     Key& operator=(const Key&);
@@ -75 +75 @@
     String m_partition;
     String m_identifier;
+    String m_range;
     HashType m_hash;
 };