From: Kurt Pattyn <pattyn.kurt@gmail.com>
Date: Fri, 7 Feb 2014 17:06:58 +0000 (+0100)
Subject: Sanitize open() method
X-Git-Tag: v5.3.0-alpha1~16
X-Git-Url: http://review.tizen.org/git/?p=contrib%2Fqtwebsockets.git;a=commitdiff_plain;h=6d64f337102d6181c8578daf8ba0b675049f6039

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>
---

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();