Fix setting of socket options

Socket options need to be set after connectToHost() to take any effect.

Change-Id: I006a8c59ba1c78d5edaa77d545bb0f640b7224fe
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 647922b1122977625b8f32fbc0bb2e9339afb4a3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

1 files changed, 8 insertions, 4 deletions

diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index 5d5b15f..3bac193 100644
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -442,8 +442,10 @@ void QWebSocketPrivate::open(const QNetworkRequest &request, bool mask)
                 QSslSocket *sslSocket = new QSslSocket(q);
                 m_pSocket = sslSocket;
                 if (Q_LIKELY(m_pSocket)) {
-                    m_pSocket->setSocketOption(QAbstractSocket::LowDelayOption, 1);
-                    m_pSocket->setSocketOption(QAbstractSocket::KeepAliveOption, 1);
+                    QObject::connect(sslSocket, &QSslSocket::connected, [sslSocket](){
+                        sslSocket->setSocketOption(QAbstractSocket::LowDelayOption, 1);
+                        sslSocket->setSocketOption(QAbstractSocket::KeepAliveOption, 1);
+                    });
                     m_pSocket->setReadBufferSize(m_readBufferSize);
                     m_pSocket->setPauseMode(m_pauseMode);
 
@@ -471,8 +473,10 @@ void QWebSocketPrivate::open(const QNetworkRequest &request, bool mask)
         if (url.scheme() == QStringLiteral("ws")) {
             m_pSocket = new QTcpSocket(q);
             if (Q_LIKELY(m_pSocket)) {
-                m_pSocket->setSocketOption(QAbstractSocket::LowDelayOption, 1);
-                m_pSocket->setSocketOption(QAbstractSocket::KeepAliveOption, 1);
+                QObject::connect(m_pSocket, &QTcpSocket::connected, [this](){
+                    m_pSocket->setSocketOption(QAbstractSocket::LowDelayOption, 1);
+                    m_pSocket->setSocketOption(QAbstractSocket::KeepAliveOption, 1);
+                });
                 m_pSocket->setReadBufferSize(m_readBufferSize);
                 m_pSocket->setPauseMode(m_pauseMode);