From: Kurt Pattyn Date: Thu, 13 Feb 2014 21:38:02 +0000 (+0100) Subject: Use queued connection for readyRead connection X-Git-Tag: v5.3.0-alpha1~9 X-Git-Url: http://review.tizen.org/git/?p=contrib%2Fqtwebsockets.git;a=commitdiff_plain;h=6c0f39441a5165f4800fcee7c256cf3ba1db0d51 Use queued connection for readyRead connection Task-number: QTBUG-36757 Change-Id: I4358563d52ecbff7b7e1575c5d34cef30b5fcd52 Reviewed-by: Kurt Pattyn --- diff --git a/src/websockets/qwebsocketserver_p.cpp b/src/websockets/qwebsocketserver_p.cpp index f1c616d..a5f9169 100644 --- a/src/websockets/qwebsocketserver_p.cpp +++ b/src/websockets/qwebsocketserver_p.cpp @@ -377,8 +377,12 @@ void QWebSocketServerPrivate::setError(QWebSocketProtocol::CloseCode code, const void QWebSocketServerPrivate::onNewConnection() { QTcpSocket *pTcpSocket = m_pTcpServer->nextPendingConnection(); + //use a queued connection because a QSslSocket + //needs the event loop to process incoming data + //if not queued, data is incomplete when handshakeReceived is called QObjectPrivate::connect(pTcpSocket, &QTcpSocket::readyRead, - this, &QWebSocketServerPrivate::handshakeReceived); + this, &QWebSocketServerPrivate::handshakeReceived, + Qt::QueuedConnection); } /*!