<!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>[169946] trunk/Source</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/169946">169946</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-13 13:37:08 -0700 (Fri, 13 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a HTTPHeaderMap::get overload that takes an HTTPHeaderName
https://bugs.webkit.org/show_bug.cgi?id=133877
Reviewed by Andreas Kling.
Source/WebCore:
* Modules/websockets/WebSocketHandshake.cpp:
(WebCore::WebSocketHandshake::serverWebSocketProtocol):
(WebCore::WebSocketHandshake::serverSetCookie):
(WebCore::WebSocketHandshake::serverSetCookie2):
(WebCore::WebSocketHandshake::serverUpgrade):
(WebCore::WebSocketHandshake::serverConnection):
(WebCore::WebSocketHandshake::serverWebSocketAccept):
* WebCore.exp.in:
* platform/network/HTTPHeaderMap.cpp:
(WebCore::HTTPHeaderMap::get):
* platform/network/HTTPHeaderMap.h:
* platform/network/HTTPHeaderNames.in:
* plugins/PluginView.cpp:
(WebCore::PluginView::handlePost):
Source/WebKit2:
* WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
(WebKit::parsePostBuffer):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketHandshakecpp">trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPHeaderMapcpp">trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPHeaderMaph">trunk/Source/WebCore/platform/network/HTTPHeaderMap.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPHeaderNamesin">trunk/Source/WebCore/platform/network/HTTPHeaderNames.in</a></li>
<li><a href="#trunkSourceWebCorepluginsPluginViewcpp">trunk/Source/WebCore/plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapeBrowserFuncscpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169945 => 169946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-13 20:34:54 UTC (rev 169945)
+++ trunk/Source/WebCore/ChangeLog 2014-06-13 20:37:08 UTC (rev 169946)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-06-13 Anders Carlsson <andersca@apple.com>
+
+ Add a HTTPHeaderMap::get overload that takes an HTTPHeaderName
+ https://bugs.webkit.org/show_bug.cgi?id=133877
+
+ Reviewed by Andreas Kling.
+
+ * Modules/websockets/WebSocketHandshake.cpp:
+ (WebCore::WebSocketHandshake::serverWebSocketProtocol):
+ (WebCore::WebSocketHandshake::serverSetCookie):
+ (WebCore::WebSocketHandshake::serverSetCookie2):
+ (WebCore::WebSocketHandshake::serverUpgrade):
+ (WebCore::WebSocketHandshake::serverConnection):
+ (WebCore::WebSocketHandshake::serverWebSocketAccept):
+ * WebCore.exp.in:
+ * platform/network/HTTPHeaderMap.cpp:
+ (WebCore::HTTPHeaderMap::get):
+ * platform/network/HTTPHeaderMap.h:
+ * platform/network/HTTPHeaderNames.in:
+ * plugins/PluginView.cpp:
+ (WebCore::PluginView::handlePost):
+
</ins><span class="cx"> 2014-06-13 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r169939.
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketHandshakecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp (169945 => 169946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp 2014-06-13 20:34:54 UTC (rev 169945)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp 2014-06-13 20:37:08 UTC (rev 169946)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> #include "CookieJar.h"
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "HTTPHeaderMap.h"
</span><ins>+#include "HTTPHeaderNames.h"
</ins><span class="cx"> #include "HTTPParsers.h"
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="lines">@@ -337,32 +338,32 @@
</span><span class="cx">
</span><span class="cx"> String WebSocketHandshake::serverWebSocketProtocol() const
</span><span class="cx"> {
</span><del>- return m_serverHandshakeResponse.httpHeaderFields().get("sec-websocket-protocol");
</del><ins>+ return m_serverHandshakeResponse.httpHeaderFields().get(HTTPHeaderName::SecWebSocketProtocol);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebSocketHandshake::serverSetCookie() const
</span><span class="cx"> {
</span><del>- return m_serverHandshakeResponse.httpHeaderFields().get("set-cookie");
</del><ins>+ return m_serverHandshakeResponse.httpHeaderFields().get(HTTPHeaderName::SetCookie);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebSocketHandshake::serverSetCookie2() const
</span><span class="cx"> {
</span><del>- return m_serverHandshakeResponse.httpHeaderFields().get("set-cookie2");
</del><ins>+ return m_serverHandshakeResponse.httpHeaderFields().get(HTTPHeaderName::SetCookie2);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebSocketHandshake::serverUpgrade() const
</span><span class="cx"> {
</span><del>- return m_serverHandshakeResponse.httpHeaderFields().get("upgrade");
</del><ins>+ return m_serverHandshakeResponse.httpHeaderFields().get(HTTPHeaderName::Upgrade);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebSocketHandshake::serverConnection() const
</span><span class="cx"> {
</span><del>- return m_serverHandshakeResponse.httpHeaderFields().get("connection");
</del><ins>+ return m_serverHandshakeResponse.httpHeaderFields().get(HTTPHeaderName::Connection);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebSocketHandshake::serverWebSocketAccept() const
</span><span class="cx"> {
</span><del>- return m_serverHandshakeResponse.httpHeaderFields().get("sec-websocket-accept");
</del><ins>+ return m_serverHandshakeResponse.httpHeaderFields().get(HTTPHeaderName::SecWebSocketAccept);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebSocketHandshake::acceptedExtensions() const
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (169945 => 169946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-06-13 20:34:54 UTC (rev 169945)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-06-13 20:37:08 UTC (rev 169946)
</span><span class="lines">@@ -1609,7 +1609,7 @@
</span><span class="cx"> __ZNK7WebCore13GraphicsLayer18accumulatedOpacityEv
</span><span class="cx"> __ZNK7WebCore13GraphicsLayer18getDebugBorderInfoERNS_5ColorERf
</span><span class="cx"> __ZNK7WebCore13GraphicsLayer26backingStoreMemoryEstimateEv
</span><del>-__ZNK7WebCore13HTTPHeaderMap3getEPKc
</del><ins>+__ZNK7WebCore13HTTPHeaderMap3getENS_14HTTPHeaderNameE
</ins><span class="cx"> __ZNK7WebCore13HTTPHeaderMap3getERKN3WTF12AtomicStringE
</span><span class="cx"> __ZNK7WebCore13HitTestResult10isLiveLinkEv
</span><span class="cx"> __ZNK7WebCore13HitTestResult10isSelectedEv
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPHeaderMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp (169945 => 169946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp 2014-06-13 20:34:54 UTC (rev 169945)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp 2014-06-13 20:37:08 UTC (rev 169946)
</span><span class="lines">@@ -99,6 +99,15 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+String HTTPHeaderMap::get(HTTPHeaderName name) const
+{
+ auto it = find(name);
+ if (it == end())
+ return String();
+
+ return it->value;
+}
+
</ins><span class="cx"> void HTTPHeaderMap::set(HTTPHeaderName name, const String& value)
</span><span class="cx"> {
</span><span class="cx"> m_headers.set(httpHeaderNameString(name).toStringWithoutCopying(), value);
</span><span class="lines">@@ -109,14 +118,6 @@
</span><span class="cx"> return m_headers.contains(httpHeaderNameString(name).toStringWithoutCopying());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String HTTPHeaderMap::get(const char* name) const
-{
- auto it = m_headers.find<CaseFoldingCStringTranslator>(name);
- if (it == end())
- return String();
- return it->value;
-}
-
</del><span class="cx"> HTTPHeaderMap::const_iterator HTTPHeaderMap::find(HTTPHeaderName name) const
</span><span class="cx"> {
</span><span class="cx"> return m_headers.find(httpHeaderNameString(name).toStringWithoutCopying());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPHeaderMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPHeaderMap.h (169945 => 169946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPHeaderMap.h 2014-06-13 20:34:54 UTC (rev 169945)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderMap.h 2014-06-13 20:37:08 UTC (rev 169946)
</span><span class="lines">@@ -63,13 +63,14 @@
</span><span class="cx"> void set(const AtomicString& name, const String& value);
</span><span class="cx"> void add(const AtomicString& name, const String& value);
</span><span class="cx">
</span><ins>+ String get(HTTPHeaderName) const;
</ins><span class="cx"> void set(HTTPHeaderName, const String& value);
</span><span class="cx"> bool contains(HTTPHeaderName) const;
</span><del>- String get(const char*) const;
</del><span class="cx"> const_iterator find(HTTPHeaderName) const;
</span><span class="cx"> bool remove(HTTPHeaderName);
</span><span class="cx">
</span><span class="cx"> // Instead of passing a string literal to any of these functions, just use a HTTPHeaderName instead.
</span><ins>+ template<size_t length> String get(const char (&)[length]) const = delete;
</ins><span class="cx"> template<size_t length> void set(const char (&)[length], const String&) = delete;
</span><span class="cx"> template<size_t length> void add(const char (&)[length], const String&) = delete;
</span><span class="cx"> template<size_t length> bool contains(const char (&)[length]) = delete;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPHeaderNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPHeaderNames.in (169945 => 169946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPHeaderNames.in 2014-06-13 20:34:54 UTC (rev 169945)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderNames.in 2014-06-13 20:37:08 UTC (rev 169946)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx">
</span><span class="cx"> Accept
</span><span class="cx"> Authorization
</span><ins>+Connection
</ins><span class="cx"> Content-Length
</span><span class="cx"> Content-Type
</span><span class="cx"> If-Match
</span><span class="lines">@@ -35,5 +36,10 @@
</span><span class="cx"> Location
</span><span class="cx"> Origin
</span><span class="cx"> Referer
</span><ins>+Sec-WebSocket-Accept
+Sec-WebSocket-Protocol
+Set-Cookie
+Set-Cookie2
+Upgrade
</ins><span class="cx"> User-Agent
</span><span class="cx"> X-Frame-Options
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/PluginView.cpp (169945 => 169946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/PluginView.cpp 2014-06-13 20:34:54 UTC (rev 169945)
+++ trunk/Source/WebCore/plugins/PluginView.cpp 2014-06-13 20:37:08 UTC (rev 169946)
</span><span class="lines">@@ -1162,7 +1162,7 @@
</span><span class="cx"> // Sometimes plugins like to set Content-Length themselves when they post,
</span><span class="cx"> // but WebFoundation does not like that. So we will remove the header
</span><span class="cx"> // and instead truncate the data to the requested length.
</span><del>- String contentLength = headerFields.get("Content-Length");
</del><ins>+ String contentLength = headerFields.get(HTTPHeaderName::ContentLength);
</ins><span class="cx">
</span><span class="cx"> if (!contentLength.isNull())
</span><span class="cx"> dataLength = min(contentLength.toInt(), (int)dataLength);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169945 => 169946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-13 20:34:54 UTC (rev 169945)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-13 20:37:08 UTC (rev 169946)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-06-13 Anders Carlsson <andersca@apple.com>
+
+ Add a HTTPHeaderMap::get overload that takes an HTTPHeaderName
+ https://bugs.webkit.org/show_bug.cgi?id=133877
+
+ Reviewed by Andreas Kling.
+
+ * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+ (WebKit::parsePostBuffer):
+
</ins><span class="cx"> 2014-06-13 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Networking process always decodes keys
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapeBrowserFuncscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (169945 => 169946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2014-06-13 20:34:54 UTC (rev 169945)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2014-06-13 20:37:08 UTC (rev 169946)
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx"> // Sometimes plugins like to set Content-Length themselves when they post,
</span><span class="cx"> // but WebFoundation does not like that. So we will remove the header
</span><span class="cx"> // and instead truncate the data to the requested length.
</span><del>- String contentLength = headerFields.get("Content-Length");
</del><ins>+ String contentLength = headerFields.get(HTTPHeaderName::ContentLength);
</ins><span class="cx">
</span><span class="cx"> if (!contentLength.isNull())
</span><span class="cx"> dataLength = std::min(contentLength.toInt(), (int)dataLength);
</span></span></pre>
</div>
</div>
</body>
</html>