diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:24:21 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:24:21 +0200 |
commit | 00156d63eea2fb7681a8a00a3144392d6325e5cb (patch) | |
tree | 40f5159d523966cac856138a32d6d369c20b536b /src/websockets/qwebsocket.cpp | |
parent | c6d19a89046763f680d7f67c6f9989b4f51fc71e (diff) | |
parent | ba9306ec5a1271275d79b2f48ceb227f79352f33 (diff) | |
download | qtwebsockets-00156d63eea2fb7681a8a00a3144392d6325e5cb.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: I7ebcdc16a8b65103abfb9640c990eddbeccdef05
Diffstat (limited to 'src/websockets/qwebsocket.cpp')
-rw-r--r-- | src/websockets/qwebsocket.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/websockets/qwebsocket.cpp b/src/websockets/qwebsocket.cpp index 85a6811..90973d6 100644 --- a/src/websockets/qwebsocket.cpp +++ b/src/websockets/qwebsocket.cpp @@ -47,17 +47,17 @@ WebSockets is a web technology providing full-duplex communications channels over a single TCP connection. The WebSocket protocol was standardized by the IETF as - \l {http://tools.ietf.org/html/rfc6455} {RFC 6455} in 2011. + \l {RFC 6455} in 2011. QWebSocket can both be used in a client application and server application. This class was modeled after QAbstractSocket. QWebSocket currently does not support - \l {http://tools.ietf.org/html/rfc6455#page-39} {extensions} and - \l {http://tools.ietf.org/html/rfc6455#page-12} {subprotocols}. + \l {WebSocket Extensions} and + \l {WebSocket Subprotocols}. QWebSocket only supports version 13 of the WebSocket protocol, as outlined in - \l {http://tools.ietf.org/html/rfc6455}{RFC 6455}. + \l {RFC 6455}. \note Some proxies do not understand certain HTTP headers used during a WebSocket handshake. In that case, non-secure WebSocket connections fail. The best way to mitigate against @@ -66,7 +66,7 @@ \warning To generate masks, this implementation of WebSockets uses the cryptographically insecure qrand() function. For more information about the importance of good masking, - see \l {http://w2spconf.com/2011/papers/websocket.pdf}. + see \l {"Talking to Yourself for Fun and Profit" by Lin-Shung Huang et al}. The best measure against attacks mentioned in the document above, is to use QWebSocket over a secure connection (\e wss://). In general, always be careful to not have 3rd party script access to @@ -265,12 +265,12 @@ QT_BEGIN_NAMESPACE * \brief Creates a new QWebSocket with the given \a origin, * the \a version of the protocol to use and \a parent. * - * The \a origin of the client is as specified in \l {http://tools.ietf.org/html/rfc6454}{RFC 6454}. + * The \a origin of the client is as specified in \l {RFC 6454}. * (The \a origin is not required for non-web browser clients - * (see \l {http://tools.ietf.org/html/rfc6455}{RFC 6455})). + * (see \l {RFC 6455})). * The \a origin may not contain new line characters, otherwise the connection will be * aborted immediately during the handshake phase. - * \note Currently only V13 (\l {http://tools.ietf.org/html/rfc6455} {RFC 6455}) is supported + * \note Currently only V13 (\l {RFC 6455}) is supported */ QWebSocket::QWebSocket(const QString &origin, QWebSocketProtocol::Version version, |