Changeset 183407 in webkit

Timestamp:

Apr 27, 2015 11:57:13 AM (9 years ago)

Author:

peavo@outlook.com

Message:

[Curl] Favicons loaded from disc cache are ignored.
​https://bugs.webkit.org/show_bug.cgi?id=143953

Reviewed by Alex Christensen.

When a favicon is loaded from the Curl disc cache, the icon data is thrown away.
This happens because we give a 304 response, which makes the icon loader ignore
the response. We can solve this by responding with 200 OK.

• platform/network/ResourceHandleInternal.h:

(WebCore::ResourceHandleInternal::ResourceHandleInternal):

• platform/network/curl/CurlCacheManager.cpp:

(WebCore::CurlCacheManager::didReceiveResponse):

• platform/network/curl/ResourceHandleManager.cpp:

(WebCore::headerCallback):
(WebCore::ResourceHandleManager::initializeHandle):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/ResourceHandleInternal.h (modified) (2 diffs)
• platform/network/curl/CurlCacheManager.cpp (modified) (1 diff)
• platform/network/curl/ResourceHandleManager.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-04-27  Per Arne Vollan  <peavo@outlook.com>
+
+        [Curl] Favicons loaded from disc cache are ignored.
+        https://bugs.webkit.org/show_bug.cgi?id=143953
+
+        Reviewed by Alex Christensen.
+
+        When a favicon is loaded from the Curl disc cache, the icon data is thrown away.
+        This happens because we give a 304 response, which makes the icon loader ignore
+        the response. We can solve this by responding with 200 OK.
+
+        * platform/network/ResourceHandleInternal.h:
+        (WebCore::ResourceHandleInternal::ResourceHandleInternal):
+        * platform/network/curl/CurlCacheManager.cpp:
+        (WebCore::CurlCacheManager::didReceiveResponse):
+        * platform/network/curl/ResourceHandleManager.cpp:
+        (WebCore::headerCallback):
+        (WebCore::ResourceHandleManager::initializeHandle):
+
 2015-04-27  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/platform/network/ResourceHandleInternal.h

@@ -88 +88 @@
 #endif
 #if USE(CURL)
-            , m_handle(0)
-            , m_url(0)
-            , m_customHeaders(0)
-            , m_cancelled(false)
-            , m_authFailureCount(0)
             , m_formDataStream(loader)
-            , m_sslErrors(0)
 #endif
 #if USE(SOUP)
@@ -152 +146 @@
 #endif
 #if USE(CURL)
-        CURL* m_handle;
-        char* m_url;
-        struct curl_slist* m_customHeaders;
+        CURL* m_handle { nullptr };
+        char* m_url { nullptr };
+        struct curl_slist* m_customHeaders { nullptr };
         ResourceResponse m_response;
-        bool m_cancelled;
-        unsigned short m_authFailureCount;
+        bool m_cancelled { false };
+        unsigned short m_authFailureCount { 0 };
 
         FormDataStream m_formDataStream;
-        unsigned m_sslErrors;
+        unsigned m_sslErrors { 0 };
         Vector<char> m_postBytes;
 
         std::unique_ptr<MultipartHandle> m_multipartHandle;
+        bool m_addedCacheValidationHeaders { false };
 #endif
 #if USE(SOUP)

trunk/Source/WebCore/platform/network/curl/CurlCacheManager.cpp

@@ -207 +207 @@
     removeCacheEntryClient(url, &job);
 
-    if (response.httpStatusCode() == 304) {
+    if (response.source() == ResourceResponseBase::Source::DiskCache) {
         readCachedData(url, &job, response);
         m_LRUEntryList.prependOrMoveToFirst(url);

trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp

@@ -554 +554 @@
             if (isHttpNotModified(httpCode)) {
                 const String& url = job->firstRequest().url().string();
-                CurlCacheManager::getInstance().getCachedResponse(url, d->m_response);
+                if (CurlCacheManager::getInstance().getCachedResponse(url, d->m_response)) {
+                    if (d->m_addedCacheValidationHeaders) {
+                        d->m_response.setHTTPStatusCode(200);
+                        d->m_response.setHTTPStatusText("OK");
+                    }
+                }
             }
             client->didReceiveResponse(job, d->m_response);
@@ -1086 +1091 @@
         HTTPHeaderMap customHeaders = job->firstRequest().httpHeaderFields();
 
-        if (CurlCacheManager::getInstance().isCached(url)) {
+        bool hasCacheHeaders = customHeaders.contains(HTTPHeaderName::IfModifiedSince) || customHeaders.contains(HTTPHeaderName::IfNoneMatch);
+        if (!hasCacheHeaders && CurlCacheManager::getInstance().isCached(url)) {
             CurlCacheManager::getInstance().addCacheEntryClient(url, job);
             HTTPHeaderMap& requestHeaders = CurlCacheManager::getInstance().requestHeaders(url);
@@ -1097 +1103 @@
                 ++it;
             }
-        } else {
-            // Make sure we don't send any cache headers when url is not cached.
-            customHeaders.remove(HTTPHeaderName::IfModifiedSince);
-            customHeaders.remove(HTTPHeaderName::IfNoneMatch);
+            d->m_addedCacheValidationHeaders = true;
         }