Changeset 97249 in webkit


Ignore:
Timestamp:
Oct 12, 2011 2:41:06 AM (13 years ago)
Author:
[email protected]
Message:

WebSocket: Update WebSocket protocol to hybi-17
​https://bugs.webkit.org/show_bug.cgi?id=69910

Reviewed by Kent Tamura.

Essential changes between hybi-10 and hybi-17 are:

  • Sec-WebSocket-Origin header has been renamed to "Origin".
  • Sec-WebSocket-Version header value has been bumped to 13.

No new tests are necessary. pywebsocket has already been updated to the latest version
which understands the new protocol. Tests under http/tests/websocket/ should keep
passing.

  • websockets/WebSocketHandshake.cpp:

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

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r97248 r97249  
     12011-10-12  Yuta Kitamura  <[email protected]>
     2
     3        WebSocket: Update WebSocket protocol to hybi-17
     4        https://bugs.webkit.org/show_bug.cgi?id=69910
     5
     6        Reviewed by Kent Tamura.
     7
     8        Essential changes between hybi-10 and hybi-17 are:
     9        - Sec-WebSocket-Origin header has been renamed to "Origin".
     10        - Sec-WebSocket-Version header value has been bumped to 13.
     11
     12        No new tests are necessary. pywebsocket has already been updated to the latest version
     13        which understands the new protocol. Tests under http/tests/websocket/ should keep
     14        passing.
     15
     16        * websockets/WebSocketHandshake.cpp:
     17        (WebCore::WebSocketHandshake::clientHandshakeMessage):
     18        (WebCore::WebSocketHandshake::clientHandshakeRequest):
     19
    1202011-10-11  Antti Koivisto  <[email protected]>
    221

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

    r91052 r97249  
    269269    fields.append("Connection: Upgrade");
    270270    fields.append("Host: " + hostName(m_url, m_secure));
    271     if (m_useHixie76Protocol)
    272         fields.append("Origin: " + clientOrigin());
    273     else
    274         fields.append("Sec-WebSocket-Origin: " + clientOrigin());
     271    fields.append("Origin: " + clientOrigin());
    275272    if (!m_clientProtocol.isEmpty())
    276273        fields.append("Sec-WebSocket-Protocol: " + m_clientProtocol);
    … …  
    290287    } else {
    291288        fields.append("Sec-WebSocket-Key: " + m_secWebSocketKey);
    292         fields.append("Sec-WebSocket-Version: 8");
     289        fields.append("Sec-WebSocket-Version: 13");
    293290    }
    294291
    … …  
    328325    request.addHeaderField("Connection", "Upgrade");
    329326    request.addHeaderField("Host", hostName(m_url, m_secure));
    330     if (m_useHixie76Protocol)
    331         request.addHeaderField("Origin", clientOrigin());
    332     else
    333         request.addHeaderField("Sec-WebSocket-Origin", clientOrigin());
     327    request.addHeaderField("Origin", clientOrigin());
    334328    if (!m_clientProtocol.isEmpty())
    335329        request.addHeaderField("Sec-WebSocket-Protocol:", m_clientProtocol);
    … …  
    350344    } else {
    351345        request.addHeaderField("Sec-WebSocket-Key", m_secWebSocketKey);
    352         request.addHeaderField("Sec-WebSocket-Version", "8");
     346        request.addHeaderField("Sec-WebSocket-Version", "13");
    353347    }
    354348
Note: See TracChangeset for help on using the changeset viewer.