diff options
author | Kurt Pattyn <pattyn.kurt@gmail.com> | 2014-02-07 18:06:58 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-07 18:58:35 +0100 |
commit | 6d64f337102d6181c8578daf8ba0b675049f6039 (patch) | |
tree | 36a913a15c599a73cc1b7e8050b118ad0b983d7b | |
parent | f7b5e9bce59c5dfdd9cc8cc2f14bbb3c6baa70d7 (diff) | |
download | qtwebsockets-6d64f337102d6181c8578daf8ba0b675049f6039.tar.gz |
Sanitize open() method
Removed the mask parameter because a web socket client does not have
a choice between masking and not masking.
Change-Id: I3c33acc235bb2a99476abb6201e6dbb6f881dd70
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
-rw-r--r-- | src/websockets/qwebsocket.cpp | 7 | ||||
-rw-r--r-- | src/websockets/qwebsocket.h | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/websockets/qwebsocket.cpp b/src/websockets/qwebsocket.cpp index 6e60230..f2a2b6a 100644 --- a/src/websockets/qwebsocket.cpp +++ b/src/websockets/qwebsocket.cpp @@ -373,14 +373,11 @@ void QWebSocket::close(QWebSocketProtocol::CloseCode closeCode, const QString &r /*! \brief Opens a websocket connection using the given \a url. - If \a mask is true, all frames will be masked; this is only necessary for client side sockets; - servers should never mask. - \note A client socket must *always* mask its frames; servers may *never* mask its frames. */ -void QWebSocket::open(const QUrl &url, bool mask) +void QWebSocket::open(const QUrl &url) { Q_D(QWebSocket); - d->open(url, mask); + d->open(url, true); } /*! diff --git a/src/websockets/qwebsocket.h b/src/websockets/qwebsocket.h index 7d1e544..660b3a3 100644 --- a/src/websockets/qwebsocket.h +++ b/src/websockets/qwebsocket.h @@ -112,7 +112,7 @@ public: public Q_SLOTS: void close(QWebSocketProtocol::CloseCode closeCode = QWebSocketProtocol::CloseCodeNormal, const QString &reason = QString()); - void open(const QUrl &url, bool mask = true); + void open(const QUrl &url); void ping(const QByteArray &payload = QByteArray()); #ifndef QT_NO_SSL void ignoreSslErrors(); |