<!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>[169975] 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/169975">169975</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-14 12:10:39 -0700 (Sat, 14 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace some uses of ResourceRequestBase::addHTTPHeaderField with setHTTPHeaderField
https://bugs.webkit.org/show_bug.cgi?id=133907
Reviewed by Andreas Kling.
* Modules/websockets/WebSocketHandshake.cpp:
(WebCore::WebSocketHandshake::clientHandshakeRequest):
* platform/network/HTTPHeaderNames.in:
* platform/network/cf/ResourceHandleCFNet.cpp:
(WebCore::applyBasicAuthorizationHeader):
* platform/network/mac/ResourceHandleMac.mm:
(WebCore::applyBasicAuthorizationHeader):</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="#trunkSourceWebCoreplatformnetworkHTTPHeaderNamesin">trunk/Source/WebCore/platform/network/HTTPHeaderNames.in</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm">trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169974 => 169975)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-14 17:49:44 UTC (rev 169974)
+++ trunk/Source/WebCore/ChangeLog 2014-06-14 19:10:39 UTC (rev 169975)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-06-14 Anders Carlsson <andersca@apple.com>
+
+ Replace some uses of ResourceRequestBase::addHTTPHeaderField with setHTTPHeaderField
+ https://bugs.webkit.org/show_bug.cgi?id=133907
+
+ Reviewed by Andreas Kling.
+
+ * Modules/websockets/WebSocketHandshake.cpp:
+ (WebCore::WebSocketHandshake::clientHandshakeRequest):
+ * platform/network/HTTPHeaderNames.in:
+ * platform/network/cf/ResourceHandleCFNet.cpp:
+ (WebCore::applyBasicAuthorizationHeader):
+ * platform/network/mac/ResourceHandleMac.mm:
+ (WebCore::applyBasicAuthorizationHeader):
+
</ins><span class="cx"> 2014-06-13 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a ResourceRequestBase::setHTTPHeaderField overload that takes a HTTPHeaderName
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketHandshakecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp (169974 => 169975)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp 2014-06-14 17:49:44 UTC (rev 169974)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp 2014-06-14 19:10:39 UTC (rev 169975)
</span><span class="lines">@@ -240,32 +240,32 @@
</span><span class="cx"> ResourceRequest request(m_url);
</span><span class="cx"> request.setHTTPMethod("GET");
</span><span class="cx">
</span><del>- request.addHTTPHeaderField("Connection", "Upgrade");
- request.addHTTPHeaderField("Host", hostName(m_url, m_secure));
- request.addHTTPHeaderField("Origin", clientOrigin());
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::Connection, "Upgrade");
+ request.setHTTPHeaderField(HTTPHeaderName::Host, hostName(m_url, m_secure));
+ request.setHTTPHeaderField(HTTPHeaderName::Origin, clientOrigin());
</ins><span class="cx"> if (!m_clientProtocol.isEmpty())
</span><del>- request.addHTTPHeaderField("Sec-WebSocket-Protocol", m_clientProtocol);
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::SecWebSocketProtocol, m_clientProtocol);
</ins><span class="cx">
</span><span class="cx"> URL url = httpURLForAuthenticationAndCookies();
</span><span class="cx"> if (m_context->isDocument()) {
</span><span class="cx"> Document* document = toDocument(m_context);
</span><span class="cx"> String cookie = cookieRequestHeaderFieldValue(document, url);
</span><span class="cx"> if (!cookie.isEmpty())
</span><del>- request.addHTTPHeaderField("Cookie", cookie);
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::Cookie, cookie);
</ins><span class="cx"> // Set "Cookie2: <cookie>" if cookies 2 exists for url?
</span><span class="cx"> }
</span><span class="cx">
</span><del>- request.addHTTPHeaderField("Pragma", "no-cache");
- request.addHTTPHeaderField("Cache-Control", "no-cache");
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::Pragma, "no-cache");
+ request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "no-cache");
</ins><span class="cx">
</span><del>- request.addHTTPHeaderField("Sec-WebSocket-Key", m_secWebSocketKey);
- request.addHTTPHeaderField("Sec-WebSocket-Version", "13");
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::SecWebSocketKey, m_secWebSocketKey);
+ request.setHTTPHeaderField(HTTPHeaderName::SecWebSocketVersion, "13");
</ins><span class="cx"> const String extensionValue = m_extensionDispatcher.createHeaderValue();
</span><span class="cx"> if (extensionValue.length())
</span><del>- request.addHTTPHeaderField("Sec-WebSocket-Extensions", extensionValue);
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::SecWebSocketExtensions, extensionValue);
</ins><span class="cx">
</span><span class="cx"> // Add a User-Agent header.
</span><del>- request.addHTTPHeaderField("User-Agent", m_context->userAgent(m_context->url()));
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::UserAgent, m_context->userAgent(m_context->url()));
</ins><span class="cx">
</span><span class="cx"> return request;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPHeaderNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPHeaderNames.in (169974 => 169975)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPHeaderNames.in 2014-06-14 17:49:44 UTC (rev 169974)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderNames.in 2014-06-14 19:10:39 UTC (rev 169975)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> Connection
</span><span class="cx"> Content-Length
</span><span class="cx"> Content-Type
</span><ins>+Cookie
</ins><span class="cx"> Host
</span><span class="cx"> If-Match
</span><span class="cx"> If-Modified-Since
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (169974 => 169975)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2014-06-14 17:49:44 UTC (rev 169974)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2014-06-14 19:10:39 UTC (rev 169975)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "FormDataStreamCFNet.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameLoader.h"
</span><ins>+#include "HTTPHeaderNames.h"
</ins><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "NetworkingContext.h"
</span><span class="cx"> #include "ResourceError.h"
</span><span class="lines">@@ -95,8 +96,8 @@
</span><span class="cx"> static void applyBasicAuthorizationHeader(ResourceRequest& request, const Credential& credential)
</span><span class="cx"> {
</span><span class="cx"> String authenticationHeader = "Basic " + base64Encode(String(credential.user() + ":" + credential.password()).utf8());
</span><del>- request.clearHTTPAuthorization(); // FIXME: Should addHTTPHeaderField be smart enough to not build comma-separated lists in headers like Authorization?
- request.addHTTPHeaderField("Authorization", authenticationHeader);
</del><ins>+
+ request.setHTTPHeaderField(HTTPHeaderName::Authorization, authenticationHeader);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ResourceHandleInternal::~ResourceHandleInternal()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (169974 => 169975)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2014-06-14 17:49:44 UTC (rev 169974)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2014-06-14 19:10:39 UTC (rev 169975)
</span><span class="lines">@@ -102,8 +102,8 @@
</span><span class="cx"> static void applyBasicAuthorizationHeader(ResourceRequest& request, const Credential& credential)
</span><span class="cx"> {
</span><span class="cx"> String authenticationHeader = "Basic " + base64Encode(String(credential.user() + ":" + credential.password()).utf8());
</span><del>- request.clearHTTPAuthorization(); // FIXME: Should addHTTPHeaderField be smart enough to not build comma-separated lists in headers like Authorization?
- request.addHTTPHeaderField("Authorization", authenticationHeader);
</del><ins>+
+ request.setHTTPHeaderField(HTTPHeaderName::Authorization, authenticationHeader);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static NSOperationQueue *operationQueueForAsyncClients()
</span></span></pre>
</div>
</div>
</body>
</html>