Diff
Modified: trunk/Source/WebCore/ChangeLog (169965 => 169966)
--- trunk/Source/WebCore/ChangeLog 2014-06-14 08:01:23 UTC (rev 169965)
+++ trunk/Source/WebCore/ChangeLog 2014-06-14 09:04:56 UTC (rev 169966)
@@ -1,3 +1,10 @@
+2014-06-14 Csaba Osztrogonác <[email protected]>
+
+ URTBF after r169943 and r169946.
+
+ * platform/network/HTTPHeaderMap.h: Removed maybe accidental deletion of the only one add function.
+ * platform/network/HTTPHeaderNames.in: Added Sec-WebSocket-Key.
+
2014-06-14 Commit Queue <[email protected]>
Unreviewed, rolling out r169963.
Modified: trunk/Source/WebCore/platform/network/HTTPHeaderMap.h (169965 => 169966)
--- trunk/Source/WebCore/platform/network/HTTPHeaderMap.h 2014-06-14 08:01:23 UTC (rev 169965)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderMap.h 2014-06-14 09:04:56 UTC (rev 169966)
@@ -72,7 +72,6 @@
// Instead of passing a string literal to any of these functions, just use a HTTPHeaderName instead.
template<size_t length> String get(const char (&)[length]) const = delete;
template<size_t length> void set(const char (&)[length], const String&) = delete;
- template<size_t length> void add(const char (&)[length], const String&) = delete;
template<size_t length> bool contains(const char (&)[length]) = delete;
template<size_t length> const_iterator find(const char(&)[length]) = delete;
template<size_t length> bool remove(const char (&)[length]) = delete;
Modified: trunk/Source/WebCore/platform/network/HTTPHeaderNames.in (169965 => 169966)
--- trunk/Source/WebCore/platform/network/HTTPHeaderNames.in 2014-06-14 08:01:23 UTC (rev 169965)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderNames.in 2014-06-14 09:04:56 UTC (rev 169966)
@@ -37,6 +37,7 @@
Origin
Referer
Sec-WebSocket-Accept
+Sec-WebSocket-Key
Sec-WebSocket-Protocol
Set-Cookie
Set-Cookie2
Modified: trunk/Source/WebKit2/ChangeLog (169965 => 169966)
--- trunk/Source/WebKit2/ChangeLog 2014-06-14 08:01:23 UTC (rev 169965)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-14 09:04:56 UTC (rev 169966)
@@ -1,3 +1,13 @@
+2014-06-14 Csaba Osztrogonác <[email protected]>
+
+ URTBF after r169943 and r169946, use the format of set/get.
+
+ * UIProcess/InspectorServer/WebInspectorServer.cpp:
+ (WebKit::WebInspectorServer::didReceiveUnrecognizedHTTPRequest):
+ * UIProcess/InspectorServer/WebSocketServerConnection.cpp:
+ (WebKit::WebSocketServerConnection::readHTTPMessage):
+ (WebKit::WebSocketServerConnection::upgradeToWebSocketServerConnection):
+
2014-06-13 Andreas Kling <[email protected]>
REGRESSION (r167635): Reference leak in NetworkResourceLoader while loads are being deferred.
Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/WebInspectorServer.cpp (169965 => 169966)
--- trunk/Source/WebKit2/UIProcess/InspectorServer/WebInspectorServer.cpp 2014-06-14 08:01:23 UTC (rev 169965)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/WebInspectorServer.cpp 2014-06-14 09:04:56 UTC (rev 169966)
@@ -30,6 +30,7 @@
#include "WebInspectorServer.h"
+#include "HTTPHeaderNames.h"
#include "HTTPRequest.h"
#include "WebInspectorProxy.h"
#include "WebSocketServerConnection.h"
@@ -124,10 +125,10 @@
bool found = platformResourceForPath(path, body, contentType);
HTTPHeaderMap headerFields;
- headerFields.set("Connection", "close");
- headerFields.set("Content-Length", String::number(body.size()));
+ headerFields.set(HTTPHeaderName::Connection, "close");
+ headerFields.set(HTTPHeaderName::ContentLength, String::number(body.size()));
if (found)
- headerFields.set("Content-Type", contentType);
+ headerFields.set(HTTPHeaderName::ContentType, contentType);
// Send when ready and close immediately afterwards.
connection->sendHTTPResponseHeader(found ? 200 : 404, found ? "OK" : "Not Found", headerFields);
Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.cpp (169965 => 169966)
--- trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.cpp 2014-06-14 08:01:23 UTC (rev 169965)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.cpp 2014-06-14 09:04:56 UTC (rev 169966)
@@ -30,6 +30,7 @@
#include "WebSocketServerConnection.h"
+#include "HTTPHeaderNames.h"
#include "HTTPRequest.h"
#include "WebSocketServer.h"
#include "WebSocketServerClient.h"
@@ -177,7 +178,7 @@
// If this is a WebSocket request, perform the WebSocket Handshake.
const HTTPHeaderMap& headers = request->headerFields();
- String upgradeHeaderValue = headers.get("Upgrade");
+ String upgradeHeaderValue = headers.get(HTTPHeaderName::Upgrade);
if (upgradeHeaderValue == "websocket") {
upgradeToWebSocketServerConnection(request);
return;
@@ -206,10 +207,10 @@
// Build and send the WebSocket handshake response.
const HTTPHeaderMap& requestHeaders = protectedRequest->headerFields();
- String accept = WebSocketHandshake::getExpectedWebSocketAccept(requestHeaders.get("Sec-WebSocket-Key"));
+ String accept = WebSocketHandshake::getExpectedWebSocketAccept(requestHeaders.get(HTTPHeaderName::SecWebSocketKey));
HTTPHeaderMap responseHeaders;
- responseHeaders.add("Upgrade", requestHeaders.get("Upgrade"));
- responseHeaders.add("Connection", requestHeaders.get("Connection"));
+ responseHeaders.add("Upgrade", requestHeaders.get(HTTPHeaderName::Upgrade));
+ responseHeaders.add("Connection", requestHeaders.get(HTTPHeaderName::Connection));
responseHeaders.add("Sec-WebSocket-Accept", accept);
sendHTTPResponseHeader(101, "WebSocket Protocol Handshake", responseHeaders);
