Diff
Modified: trunk/Source/WebCore/ChangeLog (169974 => 169975)
--- 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)
@@ -1,3 +1,18 @@
+2014-06-14 Anders Carlsson <[email protected]>
+
+ 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):
+
2014-06-13 Anders Carlsson <[email protected]>
Add a ResourceRequestBase::setHTTPHeaderField overload that takes a HTTPHeaderName
Modified: trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp (169974 => 169975)
--- 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)
@@ -240,32 +240,32 @@
ResourceRequest request(m_url);
request.setHTTPMethod("GET");
- request.addHTTPHeaderField("Connection", "Upgrade");
- request.addHTTPHeaderField("Host", hostName(m_url, m_secure));
- request.addHTTPHeaderField("Origin", clientOrigin());
+ request.setHTTPHeaderField(HTTPHeaderName::Connection, "Upgrade");
+ request.setHTTPHeaderField(HTTPHeaderName::Host, hostName(m_url, m_secure));
+ request.setHTTPHeaderField(HTTPHeaderName::Origin, clientOrigin());
if (!m_clientProtocol.isEmpty())
- request.addHTTPHeaderField("Sec-WebSocket-Protocol", m_clientProtocol);
+ request.setHTTPHeaderField(HTTPHeaderName::SecWebSocketProtocol, m_clientProtocol);
URL url = ""
if (m_context->isDocument()) {
Document* document = toDocument(m_context);
String cookie = cookieRequestHeaderFieldValue(document, url);
if (!cookie.isEmpty())
- request.addHTTPHeaderField("Cookie", cookie);
+ request.setHTTPHeaderField(HTTPHeaderName::Cookie, cookie);
// Set "Cookie2: <cookie>" if cookies 2 exists for url?
}
- request.addHTTPHeaderField("Pragma", "no-cache");
- request.addHTTPHeaderField("Cache-Control", "no-cache");
+ request.setHTTPHeaderField(HTTPHeaderName::Pragma, "no-cache");
+ request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "no-cache");
- request.addHTTPHeaderField("Sec-WebSocket-Key", m_secWebSocketKey);
- request.addHTTPHeaderField("Sec-WebSocket-Version", "13");
+ request.setHTTPHeaderField(HTTPHeaderName::SecWebSocketKey, m_secWebSocketKey);
+ request.setHTTPHeaderField(HTTPHeaderName::SecWebSocketVersion, "13");
const String extensionValue = m_extensionDispatcher.createHeaderValue();
if (extensionValue.length())
- request.addHTTPHeaderField("Sec-WebSocket-Extensions", extensionValue);
+ request.setHTTPHeaderField(HTTPHeaderName::SecWebSocketExtensions, extensionValue);
// Add a User-Agent header.
- request.addHTTPHeaderField("User-Agent", m_context->userAgent(m_context->url()));
+ request.setHTTPHeaderField(HTTPHeaderName::UserAgent, m_context->userAgent(m_context->url()));
return request;
}
Modified: trunk/Source/WebCore/platform/network/HTTPHeaderNames.in (169974 => 169975)
--- 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)
@@ -31,6 +31,7 @@
Connection
Content-Length
Content-Type
+Cookie
Host
If-Match
If-Modified-Since
Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (169974 => 169975)
--- 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)
@@ -34,6 +34,7 @@
#include "FormDataStreamCFNet.h"
#include "Frame.h"
#include "FrameLoader.h"
+#include "HTTPHeaderNames.h"
#include "Logging.h"
#include "NetworkingContext.h"
#include "ResourceError.h"
@@ -95,8 +96,8 @@
static void applyBasicAuthorizationHeader(ResourceRequest& request, const Credential& credential)
{
String authenticationHeader = "Basic " + base64Encode(String(credential.user() + ":" + credential.password()).utf8());
- request.clearHTTPAuthorization(); // FIXME: Should addHTTPHeaderField be smart enough to not build comma-separated lists in headers like Authorization?
- request.addHTTPHeaderField("Authorization", authenticationHeader);
+
+ request.setHTTPHeaderField(HTTPHeaderName::Authorization, authenticationHeader);
}
ResourceHandleInternal::~ResourceHandleInternal()
Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (169974 => 169975)
--- 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)
@@ -102,8 +102,8 @@
static void applyBasicAuthorizationHeader(ResourceRequest& request, const Credential& credential)
{
String authenticationHeader = "Basic " + base64Encode(String(credential.user() + ":" + credential.password()).utf8());
- request.clearHTTPAuthorization(); // FIXME: Should addHTTPHeaderField be smart enough to not build comma-separated lists in headers like Authorization?
- request.addHTTPHeaderField("Authorization", authenticationHeader);
+
+ request.setHTTPHeaderField(HTTPHeaderName::Authorization, authenticationHeader);
}
static NSOperationQueue *operationQueueForAsyncClients()
