Changeset 144037 in webkit

Timestamp:

Feb 26, 2013 4:01:24 AM (11 years ago)

Author:

toyoshim@chromium.org

Message:

Add User-Agent header in opening handshake headers.
​https://bugs.webkit.org/show_bug.cgi?id=110601

Reviewed by Alexey Proskuryakov.

RFC-6455 doesn't require to send User-Agent header, but allow it.
Many web application developers want to have it, and Firefox already
did it. This patch adds User-Agent header in opening handshake also in
WebKit ports.

Test: http/tests/websocket/tests/hybi/useragent-in-openinghandshake.html

Source/WebCore:

• Modules/websockets/WebSocketHandshake.cpp:

(WebCore::WebSocketHandshake::clientHandshakeMessage):
(WebCore::WebSocketHandshake::clientHandshakeRequest):

LayoutTests:

• http/tests/websocket/tests/hybi/sendback_ua_wsh.py: Added.

(web_socket_do_extra_handshake):
(web_socket_transfer_data):

• http/tests/websocket/tests/hybi/useragent-in-openinghandshake-expected.txt: Added.
• http/tests/websocket/tests/hybi/useragent-in-openinghandshake.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/websocket/tests/hybi/sendback_ua_wsh.py (added)
• LayoutTests/http/tests/websocket/tests/hybi/useragent-in-openinghandshake-expected.txt (added)
• LayoutTests/http/tests/websocket/tests/hybi/useragent-in-openinghandshake.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/websockets/WebSocketHandshake.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-26  Takashi Toyoshima  <toyoshim@chromium.org>
+
+        Add User-Agent header in opening handshake headers.
+        https://bugs.webkit.org/show_bug.cgi?id=110601
+
+        Reviewed by Alexey Proskuryakov.
+
+        RFC-6455 doesn't require to send User-Agent header, but allow it.
+        Many web application developers want to have it, and Firefox already
+        did it. This patch adds User-Agent header in opening handshake also in
+        WebKit ports.
+
+        Test: http/tests/websocket/tests/hybi/useragent-in-openinghandshake.html
+
+        * http/tests/websocket/tests/hybi/sendback_ua_wsh.py: Added.
+        (web_socket_do_extra_handshake):
+        (web_socket_transfer_data):
+        * http/tests/websocket/tests/hybi/useragent-in-openinghandshake-expected.txt: Added.
+        * http/tests/websocket/tests/hybi/useragent-in-openinghandshake.html: Added.
+
 2013-02-26  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-26  Takashi Toyoshima  <toyoshim@chromium.org>
+
+        Add User-Agent header in opening handshake headers.
+        https://bugs.webkit.org/show_bug.cgi?id=110601
+
+        Reviewed by Alexey Proskuryakov.
+
+        RFC-6455 doesn't require to send User-Agent header, but allow it.
+        Many web application developers want to have it, and Firefox already
+        did it. This patch adds User-Agent header in opening handshake also in
+        WebKit ports.
+
+        Test: http/tests/websocket/tests/hybi/useragent-in-openinghandshake.html
+
+        * Modules/websockets/WebSocketHandshake.cpp:
+        (WebCore::WebSocketHandshake::clientHandshakeMessage):
+        (WebCore::WebSocketHandshake::clientHandshakeRequest):
+
 2013-02-26  Mike West  <mkwst@chromium.org>
 

trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp

@@ -220 +220 @@
         fields.append("Sec-WebSocket-Extensions: " + extensionValue);
 
+    // Add a User-Agent header.
+    fields.append("User-Agent: " + m_context->userAgent(m_context->url()));
+
     // Fields in the handshake are sent by the client in a random order; the
     // order is not meaningful.  Thus, it's ok to send the order we constructed
@@ -264 +267 @@
     if (extensionValue.length())
         request->addHeaderField("Sec-WebSocket-Extensions", extensionValue);
+
+    // Add a User-Agent header.
+    request->addHeaderField("User-Agent", m_context->userAgent(m_context->url()));
 
     return request.release();