<!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>[170023] trunk/Source/WebCore</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/170023">170023</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-16 12:46:36 -0700 (Mon, 16 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use HTTPHeaderName in more places
https://bugs.webkit.org/show_bug.cgi?id=133948
Reviewed by Andreas Kling.
* loader/cache/CachedRawResource.cpp:
(WebCore::shouldIgnoreHeaderForCacheReuse):
* platform/network/HTTPHeaderNames.in:
* xml/XMLHttpRequest.cpp:
(WebCore::isSetCookieHeader):
(WebCore::isForbiddenRequestHeader):
(WebCore::XMLHttpRequest::isAllowedHTTPHeader):
(WebCore::XMLHttpRequestStaticData::XMLHttpRequestStaticData): Deleted.
(WebCore::staticData): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedRawResourcecpp">trunk/Source/WebCore/loader/cache/CachedRawResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPHeaderNamesin">trunk/Source/WebCore/platform/network/HTTPHeaderNames.in</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170022 => 170023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-16 19:27:46 UTC (rev 170022)
+++ trunk/Source/WebCore/ChangeLog 2014-06-16 19:46:36 UTC (rev 170023)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-06-16 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Use HTTPHeaderName in more places
+ https://bugs.webkit.org/show_bug.cgi?id=133948
+
+ Reviewed by Andreas Kling.
+
+ * loader/cache/CachedRawResource.cpp:
+ (WebCore::shouldIgnoreHeaderForCacheReuse):
+ * platform/network/HTTPHeaderNames.in:
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::isSetCookieHeader):
+ (WebCore::isForbiddenRequestHeader):
+ (WebCore::XMLHttpRequest::isAllowedHTTPHeader):
+ (WebCore::XMLHttpRequestStaticData::XMLHttpRequestStaticData): Deleted.
+ (WebCore::staticData): Deleted.
+
+2014-06-16 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Add HTTPHeaderName overloads on ResourceResponseBase
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=133946
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedRawResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedRawResource.cpp (170022 => 170023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2014-06-16 19:27:46 UTC (rev 170022)
+++ trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2014-06-16 19:46:36 UTC (rev 170023)
</span><span class="lines">@@ -29,10 +29,11 @@
</span><span class="cx"> #include "CachedRawResourceClient.h"
</span><span class="cx"> #include "CachedResourceClientWalker.h"
</span><span class="cx"> #include "CachedResourceLoader.h"
</span><ins>+#include "HTTPHeaderNames.h"
</ins><span class="cx"> #include "ResourceBuffer.h"
</span><span class="cx"> #include "SubresourceLoader.h"
</span><del>-#include <wtf/NeverDestroyed.h>
</del><span class="cx"> #include <wtf/PassRefPtr.h>
</span><ins>+#include <wtf/text/StringView.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -199,20 +200,25 @@
</span><span class="cx"> m_options.dataBufferingPolicy = dataBufferingPolicy;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool shouldIgnoreHeaderForCacheReuse(AtomicString headerName)
</del><ins>+static bool shouldIgnoreHeaderForCacheReuse(const String& headerName)
</ins><span class="cx"> {
</span><ins>+ HTTPHeaderName name;
+ if (!findHTTPHeaderName(headerName, name))
+ return false;
+
+ switch (name) {
</ins><span class="cx"> // FIXME: This list of headers that don't affect cache policy almost certainly isn't complete.
</span><del>- static NeverDestroyed<HashSet<AtomicString>> m_headers;
- if (m_headers.get().isEmpty()) {
- m_headers.get().add("Accept");
- m_headers.get().add("Cache-Control");
- m_headers.get().add("Origin");
- m_headers.get().add("Pragma");
- m_headers.get().add("Purpose");
- m_headers.get().add("Referer");
- m_headers.get().add("User-Agent");
</del><ins>+ case HTTPHeaderName::Accept:
+ case HTTPHeaderName::CacheControl:
+ case HTTPHeaderName::Pragma:
+ case HTTPHeaderName::Purpose:
+ case HTTPHeaderName::Referer:
+ case HTTPHeaderName::UserAgent:
+ return true;
+
+ default:
+ return false;
</ins><span class="cx"> }
</span><del>- return m_headers.get().contains(headerName);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CachedRawResource::canReuse(const ResourceRequest& newRequest) const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPHeaderNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPHeaderNames.in (170022 => 170023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPHeaderNames.in 2014-06-16 19:27:46 UTC (rev 170022)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderNames.in 2014-06-16 19:46:36 UTC (rev 170023)
</span><span class="lines">@@ -24,6 +24,8 @@
</span><span class="cx"> //
</span><span class="cx">
</span><span class="cx"> Accept
</span><ins>+Accept-Charset
+Accept-Encoding
</ins><span class="cx"> Access-Control-Allow-Credentials
</span><span class="cx"> Access-Control-Allow-Headers
</span><span class="cx"> Access-Control-Allow-Methods
</span><span class="lines">@@ -43,10 +45,14 @@
</span><span class="cx"> Content-Security-Policy
</span><span class="cx"> Content-Security-Policy-Report-Only
</span><span class="cx"> Content-Type
</span><ins>+Content-Transfer-Encoding
</ins><span class="cx"> Cookie
</span><ins>+Cookie2
</ins><span class="cx"> Date
</span><ins>+DNT
</ins><span class="cx"> Default-Style
</span><span class="cx"> ETag
</span><ins>+Expect
</ins><span class="cx"> Expires
</span><span class="cx"> Host
</span><span class="cx"> If-Match
</span><span class="lines">@@ -54,6 +60,7 @@
</span><span class="cx"> If-None-Match
</span><span class="cx"> If-Range
</span><span class="cx"> If-Unmodified-Since
</span><ins>+Keep-Alive
</ins><span class="cx"> Last-Event-ID
</span><span class="cx"> Last-Modified
</span><span class="cx"> Location
</span><span class="lines">@@ -72,9 +79,13 @@
</span><span class="cx"> Sec-WebSocket-Version
</span><span class="cx"> Set-Cookie
</span><span class="cx"> Set-Cookie2
</span><ins>+TE
</ins><span class="cx"> Timing-Allow-Origin
</span><ins>+Trailer
+Transfer-Encoding
</ins><span class="cx"> Upgrade
</span><span class="cx"> User-Agent
</span><ins>+Via
</ins><span class="cx"> X-DNS-Prefetch-Control
</span><span class="cx"> X-Frame-Options
</span><span class="cx"> X-WebKit-CSP
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (170022 => 170023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-06-16 19:27:46 UTC (rev 170022)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-06-16 19:46:36 UTC (rev 170023)
</span><span class="lines">@@ -78,59 +78,8 @@
</span><span class="cx"> XMLHttpRequestSendArrayBufferOrViewMax,
</span><span class="cx"> };
</span><span class="cx">
</span><del>-struct XMLHttpRequestStaticData {
- WTF_MAKE_NONCOPYABLE(XMLHttpRequestStaticData); WTF_MAKE_FAST_ALLOCATED;
-public:
- XMLHttpRequestStaticData();
- const String m_proxyHeaderPrefix;
- const String m_secHeaderPrefix;
- const HashSet<String, CaseFoldingHash> m_forbiddenRequestHeaders;
-};
-
-XMLHttpRequestStaticData::XMLHttpRequestStaticData()
- : m_proxyHeaderPrefix("proxy-")
- , m_secHeaderPrefix("sec-")
- , m_forbiddenRequestHeaders({
- "accept-charset",
- "accept-encoding",
- "access-control-request-headers",
- "access-control-request-method",
- "connection",
- "content-length",
- "content-transfer-encoding",
- "cookie",
- "cookie2",
- "date",
- "dnt",
- "expect",
- "host",
- "keep-alive",
- "origin",
- "referer",
- "te",
- "trailer",
- "transfer-encoding",
- "upgrade",
- "user-agent",
- "via",
- })
</del><ins>+static bool isSetCookieHeader(const String& name)
</ins><span class="cx"> {
</span><del>-}
-
-static const XMLHttpRequestStaticData& staticData()
-{
- static std::once_flag onceFlag;
- static LazyNeverDestroyed<XMLHttpRequestStaticData> staticData;
-
- std::call_once(onceFlag, [] {
- staticData.construct();
- });
-
- return staticData;
-}
-
-static bool isSetCookieHeader(const AtomicString& name)
-{
</del><span class="cx"> return equalIgnoringCase(name, "set-cookie") || equalIgnoringCase(name, "set-cookie2");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -457,10 +406,54 @@
</span><span class="cx"> return method;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool isForbiddenRequestHeader(const String& name)
+{
+ HTTPHeaderName headerName;
+ if (!findHTTPHeaderName(name, headerName))
+ return false;
+
+ switch (headerName) {
+ case HTTPHeaderName::AcceptCharset:
+ case HTTPHeaderName::AcceptEncoding:
+ case HTTPHeaderName::AccessControlRequestHeaders:
+ case HTTPHeaderName::AccessControlRequestMethod:
+ case HTTPHeaderName::Connection:
+ case HTTPHeaderName::ContentLength:
+ case HTTPHeaderName::ContentTransferEncoding:
+ case HTTPHeaderName::Cookie:
+ case HTTPHeaderName::Cookie2:
+ case HTTPHeaderName::Date:
+ case HTTPHeaderName::DNT:
+ case HTTPHeaderName::Expect:
+ case HTTPHeaderName::Host:
+ case HTTPHeaderName::KeepAlive:
+ case HTTPHeaderName::Origin:
+ case HTTPHeaderName::Referer:
+ case HTTPHeaderName::TE:
+ case HTTPHeaderName::Trailer:
+ case HTTPHeaderName::TransferEncoding:
+ case HTTPHeaderName::Upgrade:
+ case HTTPHeaderName::UserAgent:
+ case HTTPHeaderName::Via:
+ return true;
+
+ default:
+ return false;
+ }
+}
+
</ins><span class="cx"> bool XMLHttpRequest::isAllowedHTTPHeader(const String& name)
</span><span class="cx"> {
</span><del>- return !staticData().m_forbiddenRequestHeaders.contains(name) && !name.startsWith(staticData().m_proxyHeaderPrefix, false)
- && !name.startsWith(staticData().m_secHeaderPrefix, false);
</del><ins>+ if (isForbiddenRequestHeader(name))
+ return false;
+
+ if (name.startsWith("proxy-", false))
+ return false;
+
+ if (name.startsWith("sec-", false))
+ return false;
+
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void XMLHttpRequest::open(const String& method, const URL& url, ExceptionCode& ec)
</span></span></pre>
</div>
</div>
</body>
</html>