Changeset 186355 in webkit

Timestamp:

Jul 6, 2015, 9:44:37 AM (10 years ago)

Author:

Antti Koivisto

Message:

With multipart/replaced (e.g. motion JPEG), m_bufferedDataForCache grows unbounded in Networking process
​https://bugs.webkit.org/show_bug.cgi?id=146630
<rdar://problem/21677340>

Reviewed by Chris Dumez.

• NetworkProcess/NetworkResourceLoader.cpp:

(WebKit::NetworkResourceLoader::didReceiveResponseAsync):

Don't buffer multipart/x-mixed-replace. We never want to cache these.

(WebKit::NetworkResourceLoader::didReceiveBuffer):

Limit the maximum size of the cache buffer to 10MB. This prevents unbounded memory growth if the resource
keeps streaming. It also prevents giant entries from pushing other data out of the cache.

(WebKit::NetworkResourceLoader::didFinishLoading):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkResourceLoader.cpp (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-07-06  Antti Koivisto  <antti@apple.com>
+
+        With multipart/replaced (e.g. motion JPEG), m_bufferedDataForCache grows unbounded in Networking process
+        https://bugs.webkit.org/show_bug.cgi?id=146630
+        <rdar://problem/21677340>
+
+        Reviewed by Chris Dumez.
+
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::didReceiveResponseAsync):
+
+            Don't buffer multipart/x-mixed-replace. We never want to cache these.
+
+        (WebKit::NetworkResourceLoader::didReceiveBuffer):
+
+            Limit the maximum size of the cache buffer to 10MB. This prevents unbounded memory growth if the resource
+            keeps streaming. It also prevents giant entries from pushing other data out of the cache.
+
+        (WebKit::NetworkResourceLoader::didFinishLoading):
+
 2015-07-06  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp

@@ -245 +245 @@
     bool shouldSendDidReceiveResponse = true;
 #if ENABLE(NETWORK_CACHE)
+    if (m_response.isMultipart())
+        m_bufferedDataForCache = nullptr;
+
     if (m_cacheEntryForValidation) {
         bool validationSucceeded = m_response.httpStatusCode() == 304; // 304 Not Modified
@@ -289 +292 @@
     ASSERT(!m_cacheEntryForValidation);
 
-    if (m_bufferedDataForCache)
-        m_bufferedDataForCache->append(buffer.get());
+    if (m_bufferedDataForCache) {
+        // Prevent memory growth in case of streaming data.
+        const size_t maximumCacheBufferSize = 10 * 1014 * 1024;
+        if (m_bufferedDataForCache->size() + buffer->size() <= maximumCacheBufferSize)
+            m_bufferedDataForCache->append(buffer.get());
+        else
+            m_bufferedDataForCache = nullptr;
+    }
 #endif
     // FIXME: At least on OS X Yosemite we always get -1 from the resource handle.
@@ -328 +337 @@
 
         bool isPrivate = sessionID().isEphemeral();
-        if (hasCacheableRedirect && !isPrivate) {
+        if (m_bufferedDataForCache && hasCacheableRedirect && !isPrivate) {
             // Keep the connection alive.
             RefPtr<NetworkConnectionToWebProcess> connection(connectionToWebProcess());