Changeset 173666 in webkit

Timestamp:

Sep 16, 2014 12:22:39 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[Curl] Sometimes incomplete or empty content can be loaded from cache.
​https://bugs.webkit.org/show_bug.cgi?id=136855

Patch by ​peavo@outlook.com <​peavo@outlook.com> on 2014-09-16
Reviewed by Alex Christensen.

Sometimes, when two requests with the same url are started at the same time,
there is a possibility of loading incomplete or empty content from the cache.
This happens because the method CurlCacheEntry::isLoading() is returning the wrong status
in the time period between the headers are received, and the content data is received.
This can be fixed by using a flag for the load status, instead of checking whether
the content file is open.

• platform/network/curl/CurlCacheEntry.cpp:

(WebCore::CurlCacheEntry::CurlCacheEntry): Initialize loading flag.
(WebCore::CurlCacheEntry::isLoading): Return loading flag.
(WebCore::CurlCacheEntry::didFail): Call new method to set loading flag.
(WebCore::CurlCacheEntry::didFinishLoading): Ditto.
(WebCore::CurlCacheEntry::setIsLoading): Added new method to set loading flag.

• platform/network/curl/CurlCacheEntry.h: Added loading flag and new method to set it.
• platform/network/curl/CurlCacheManager.cpp:

(WebCore::CurlCacheManager::didReceiveResponse): Call new method to set loading flag.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/curl/CurlCacheEntry.cpp (modified) (5 diffs)
• platform/network/curl/CurlCacheEntry.h (modified) (3 diffs)
• platform/network/curl/CurlCacheManager.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-09-16  peavo@outlook.com  <peavo@outlook.com>
+
+        [Curl] Sometimes incomplete or empty content can be loaded from cache.
+        https://bugs.webkit.org/show_bug.cgi?id=136855
+
+        Reviewed by Alex Christensen.
+
+        Sometimes, when two requests with the same url are started at the same time,
+        there is a possibility of loading incomplete or empty content from the cache.
+        This happens because the method CurlCacheEntry::isLoading() is returning the wrong status
+        in the time period between the headers are received, and the content data is received.
+        This can be fixed by using a flag for the load status, instead of checking whether
+        the content file is open. 
+
+        * platform/network/curl/CurlCacheEntry.cpp:
+        (WebCore::CurlCacheEntry::CurlCacheEntry): Initialize loading flag.
+        (WebCore::CurlCacheEntry::isLoading): Return loading flag.
+        (WebCore::CurlCacheEntry::didFail): Call new method to set loading flag.
+        (WebCore::CurlCacheEntry::didFinishLoading): Ditto.
+        (WebCore::CurlCacheEntry::setIsLoading): Added new method to set loading flag.
+        * platform/network/curl/CurlCacheEntry.h: Added loading flag and new method to set it.
+        * platform/network/curl/CurlCacheManager.cpp:
+        (WebCore::CurlCacheManager::didReceiveResponse): Call new method to set loading flag.
+
 2014-09-16  Chris Dumez  <cdumez@apple.com>
 

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

@@ -54 +54 @@
     , m_expireDate(-1)
     , m_headerParsed(false)
+    , m_isLoading(false)
     , m_job(job)
 {
@@ -70 +71 @@
 }
 
-bool CurlCacheEntry::isLoading()
-{
-    return isHandleValid(m_contentFile);
+bool CurlCacheEntry::isLoading() const
+{
+    return m_isLoading;
 }
 
@@ -116 +117 @@
         return false;
 
-    job->getInternal()->client()->didReceiveData(job, buffer.data(), buffer.size(), 0);
+    if (buffer.size())
+        job->getInternal()->client()->didReceiveData(job, buffer.data(), buffer.size(), 0);
+
     return true;
 }
@@ -200 +203 @@
 {
     // The cache manager will call invalidate()
-    closeContentFile();
+    setIsLoading(false);
 }
 
 void CurlCacheEntry::didFinishLoading()
 {
-    closeContentFile();
+    setIsLoading(false);
 }
 
@@ -347 +350 @@
 }
 
+void CurlCacheEntry::setIsLoading(bool isLoading)
+{
+    m_isLoading = isLoading;
+    if (m_isLoading)
+        openContentFile();
+    else
+        closeContentFile();
+}
+
 size_t CurlCacheEntry::entrySize()
 {

trunk/Source/WebCore/platform/network/curl/CurlCacheEntry.h

@@ -46 +46 @@
 
     bool isCached();
-    bool isLoading();
+    bool isLoading() const;
     size_t entrySize();
     HTTPHeaderMap& requestHeaders() { return m_requestHeaders; }
@@ -62 +62 @@
     bool parseResponseHeaders(const ResourceResponse&);
 
+    void setIsLoading(bool);
+
     const ResourceHandle* getJob() const { return m_job; }
 
@@ -74 +76 @@
     double m_expireDate;
     bool m_headerParsed;
+    bool m_isLoading;
 
     ResourceResponse m_cachedResponse;

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

@@ -219 +219 @@
         bool cacheable = cacheEntry->parseResponseHeaders(response);
         if (cacheable) {
+            cacheEntry->setIsLoading(true);
             m_LRUEntryList.prependOrMoveToFirst(url);
             m_index.set(url, WTF::move(cacheEntry));