<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[186355] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/186355">186355</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-07-06 09:44:37 -0700 (Mon, 06 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (186354 => 186355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-06 15:08:36 UTC (rev 186354)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-06 16:44:37 UTC (rev 186355)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+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):
+
</ins><span class="cx"> 2015-07-06 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Guard X11-specific code in webkitWebViewBaseDidRelaunchWebProcess()
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (186354 => 186355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2015-07-06 15:08:36 UTC (rev 186354)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2015-07-06 16:44:37 UTC (rev 186355)
</span><span class="lines">@@ -244,6 +244,9 @@
</span><span class="cx">
</span><span class="cx"> bool shouldSendDidReceiveResponse = true;
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><ins>+ if (m_response.isMultipart())
+ m_bufferedDataForCache = nullptr;
+
</ins><span class="cx"> if (m_cacheEntryForValidation) {
</span><span class="cx"> bool validationSucceeded = m_response.httpStatusCode() == 304; // 304 Not Modified
</span><span class="cx"> if (validationSucceeded)
</span><span class="lines">@@ -288,8 +291,14 @@
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="cx"> ASSERT(!m_cacheEntryForValidation);
</span><span class="cx">
</span><del>- if (m_bufferedDataForCache)
- m_bufferedDataForCache->append(buffer.get());
</del><ins>+ 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;
+ }
</ins><span class="cx"> #endif
</span><span class="cx"> // FIXME: At least on OS X Yosemite we always get -1 from the resource handle.
</span><span class="cx"> unsigned encodedDataLength = reportedEncodedDataLength >= 0 ? reportedEncodedDataLength : buffer->size();
</span><span class="lines">@@ -327,7 +336,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool isPrivate = sessionID().isEphemeral();
</span><del>- if (hasCacheableRedirect && !isPrivate) {
</del><ins>+ if (m_bufferedDataForCache && hasCacheableRedirect && !isPrivate) {
</ins><span class="cx"> // Keep the connection alive.
</span><span class="cx"> RefPtr<NetworkConnectionToWebProcess> connection(connectionToWebProcess());
</span><span class="cx"> RefPtr<NetworkResourceLoader> loader(this);
</span></span></pre>
</div>
</div>
</body>
</html>