4 files changed, 38 insertions, 5 deletions

diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index 9b94d04..0334b8a 100644
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -113,6 +113,7 @@ QWebSocketPrivate::QWebSocketPrivate(const QString &origin, QWebSocketProtocol::
     m_defaultMaskGenerator(),
     m_handshakeState(NothingDoneState)
 {
+    m_pingTimer.start();
 }
 
 /*!
@@ -144,6 +145,7 @@ QWebSocketPrivate::QWebSocketPrivate(QTcpSocket *pTcpSocket, QWebSocketProtocol:
     m_defaultMaskGenerator(),
     m_handshakeState(NothingDoneState)
 {
+    m_pingTimer.start();
 }
 
 /*!
diff --git a/src/websockets/qwebsocket_p.h b/src/websockets/qwebsocket_p.h
index 4b39dfc..e72daa5 100644
--- a/src/websockets/qwebsocket_p.h
+++ b/src/websockets/qwebsocket_p.h
@@ -61,7 +61,7 @@
 #include <QtNetwork/QSslError>
 #include <QtNetwork/QSslSocket>
 #endif
-#include <QtCore/QTime>
+#include <QtCore/QElapsedTimer>
 #include <private/qobject_p.h>
 
 #include "qwebsocket.h"
@@ -229,7 +229,7 @@ private:
     QWebSocketProtocol::CloseCode m_closeCode;
     QString m_closeReason;
 
-    QTime m_pingTimer;
+    QElapsedTimer m_pingTimer;
 
     QWebSocketDataProcessor m_dataProcessor;
     QWebSocketConfiguration m_configuration;
diff --git a/src/websockets/qwebsockethandshakeresponse.cpp b/src/websockets/qwebsockethandshakeresponse.cpp
index 383f1bf..d3ef609 100644
--- a/src/websockets/qwebsockethandshakeresponse.cpp
+++ b/src/websockets/qwebsockethandshakeresponse.cpp
@@ -162,13 +162,16 @@ QString QWebSocketHandshakeResponse::getHandshakeResponse(
         if (request.isValid()) {
             const QString acceptKey = calculateAcceptKey(request.key());
             const QList<QString> matchingProtocols =
-                listIntersection(supportedProtocols, request.protocols(), std::less<>());
+                listIntersection(supportedProtocols, request.protocols(),
+                                 std::less<QString>());
             //TODO: extensions must be kept in the order in which they arrive
             //cannot use set.intersect() to get the supported extensions
             const QList<QString> matchingExtensions =
-                listIntersection(supportedExtensions, request.extensions(), std::less<>());
+                listIntersection(supportedExtensions, request.extensions(),
+                                 std::less<QString>());
             const QList<QWebSocketProtocol::Version> matchingVersions =
-                listIntersection(supportedVersions, request.versions(), std::greater<>()); //sort in descending order
+                listIntersection(supportedVersions, request.versions(),
+                                 std::greater<QWebSocketProtocol::Version>()); //sort in descending order
 
             if (Q_UNLIKELY(matchingVersions.isEmpty())) {
                 m_error = QWebSocketProtocol::CloseCodeProtocolError;
diff --git a/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp b/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp
index 442196b..20d7060 100644
--- a/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp
+++ b/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp
@@ -116,6 +116,7 @@ private Q_SLOTS:
     void tst_scheme(); // qtbug-55927
     void tst_handleConnection();
     void tst_handshakeTimeout(); // qtbug-63312, qtbug-57026
+    void multipleFrames();
 
 private:
     bool m_shouldSkipUnsupportedIpv6Test;
@@ -823,6 +824,33 @@ void tst_QWebSocketServer::tst_handshakeTimeout()
     }
 }
 
+void tst_QWebSocketServer::multipleFrames()
+{
+    QWebSocketServer server(QString(), QWebSocketServer::NonSecureMode);
+    QSignalSpy serverConnectionSpy(&server, &QWebSocketServer::newConnection);
+    QVERIFY(server.listen());
+
+    QWebSocket socket;
+    QSignalSpy socketConnectedSpy(&socket, &QWebSocket::connected);
+    QSignalSpy messageReceivedSpy(&socket, &QWebSocket::binaryMessageReceived);
+    socket.open(server.serverUrl().toString());
+
+    QVERIFY(serverConnectionSpy.wait());
+    QVERIFY(socketConnectedSpy.wait());
+
+    auto serverSocket = std::unique_ptr<QWebSocket>(server.nextPendingConnection());
+    QVERIFY(serverSocket);
+    for (int i = 0; i < 10; i++)
+        serverSocket->sendBinaryMessage(QByteArray("abc"));
+    if (serverSocket->bytesToWrite())
+        QVERIFY(serverSocket->flush());
+
+    QVERIFY(messageReceivedSpy.wait());
+    // Since there's no guarantee the operating system will fit all 10 websocket frames into 1 tcp
+    // frame, let's just assume it will do at least 2. EXCEPT_FAIL any which doesn't merge any.
+    QVERIFY2(messageReceivedSpy.count() > 1, "Received only 1 message in the TCP frame!");
+}
+
 QTEST_MAIN(tst_QWebSocketServer)
 
 #include "tst_qwebsocketserver.moc"