diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:44:07 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:44:07 +0200 |
commit | 2baa571e0d95d3e9bf182dc035c8ff0970bb68ea (patch) | |
tree | 174e872c084319e19cd0ebd74915048d99c18c84 /src/websockets/qwebsocketprotocol.cpp | |
parent | 40c0c43f59b97e5bee4a8994a499800e1f46b8d1 (diff) | |
parent | 00156d63eea2fb7681a8a00a3144392d6325e5cb (diff) | |
download | qtwebsockets-2baa571e0d95d3e9bf182dc035c8ff0970bb68ea.tar.gz |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I8a2d6875b68c99786f99ec0dc380f8725c6abd42
Diffstat (limited to 'src/websockets/qwebsocketprotocol.cpp')
-rw-r--r-- | src/websockets/qwebsocketprotocol.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/websockets/qwebsocketprotocol.cpp b/src/websockets/qwebsocketprotocol.cpp index 677f836..5cde1a7 100644 --- a/src/websockets/qwebsocketprotocol.cpp +++ b/src/websockets/qwebsocketprotocol.cpp @@ -82,40 +82,34 @@ QT_BEGIN_NAMESPACE \brief The different defined versions of the WebSocket protocol. For an overview of the differences between the different protocols, see - <http://code.google.com/p/pywebsocket/wiki/WebSocketProtocolSpec> + \l {pywebsocket's WebSocketProtocolSpec}. \value VersionUnknown Unknown or unspecified version. - \value Version0 hixie76: - http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-76 & - hybi-00: - http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-00. + \value Version0 \l{hixie76} and \l{hybi-00}. Works with key1, key2 and a key in the payload. Attribute: Sec-WebSocket-Draft value 0. Not supported by QtWebSockets. - \value Version4 hybi-04: - http://tools.ietf.org/id/draft-ietf-hybi-thewebsocketprotocol-04.txt. + \value Version4 \l{hybi-04}. Changed handshake: key1, key2, key3 ==> Sec-WebSocket-Key, Sec-WebSocket-Nonce, Sec-WebSocket-Accept Sec-WebSocket-Draft renamed to Sec-WebSocket-Version Sec-WebSocket-Version = 4. Not supported by QtWebSockets. - \value Version5 hybi-05: - http://tools.ietf.org/id/draft-ietf-hybi-thewebsocketprotocol-05.txt. + \value Version5 \l{hybi-05}. Sec-WebSocket-Version = 5 Removed Sec-WebSocket-Nonce Added Sec-WebSocket-Accept. Not supported by QtWebSockets. \value Version6 Sec-WebSocket-Version = 6. Not supported by QtWebSockets. - \value Version7 hybi-07: - http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-07. + \value Version7 \l{hybi-07}. Sec-WebSocket-Version = 7. Not supported by QtWebSockets. \value Version8 hybi-8, hybi-9, hybi-10, hybi-11 and hybi-12. Status codes 1005 and 1006 are added and all codes are now unsigned Internal error results in 1006. Not supported by QtWebSockets. - \value Version13 hybi-13, hybi14, hybi-15, hybi-16, hybi-17 and RFC 6455. + \value Version13 hybi-13, hybi14, hybi-15, hybi-16, hybi-17 and \l{RFC 6455}. Sec-WebSocket-Version = 13 Status code 1004 is now reserved Added 1008, 1009 and 1010 |