diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 13:55:07 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 13:55:07 +0200 |
| commit | 6484afa4b7645b31e370f4eb8ea0b93fc3bf052a (patch) | |
| tree | 9ff1eacd8dcb1943613785e3ad6df77bf38523bb /tests/auto/websockets/handshakeresponse/tst_handshakeresponse.cpp | |
| parent | f11862a05591452bdad9c1abd244288a2964a036 (diff) | |
| parent | 12e424f241b29ef26ad2a3a70740d8b320e9e85a (diff) | |
| download | qtwebsockets-6484afa4b7645b31e370f4eb8ea0b93fc3bf052a.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
Change-Id: Ie4184b0788b6a0a5a85ca8e4d1547c33f7027ca0
Diffstat (limited to 'tests/auto/websockets/handshakeresponse/tst_handshakeresponse.cpp')
| -rw-r--r-- | tests/auto/websockets/handshakeresponse/tst_handshakeresponse.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/websockets/handshakeresponse/tst_handshakeresponse.cpp b/tests/auto/websockets/handshakeresponse/tst_handshakeresponse.cpp index b5f103b..7d35cd0 100644 --- a/tests/auto/websockets/handshakeresponse/tst_handshakeresponse.cpp +++ b/tests/auto/websockets/handshakeresponse/tst_handshakeresponse.cpp @@ -91,7 +91,7 @@ void tst_HandshakeResponse::tst_date_response() QStringLiteral("Sec-WebSocket-Key: AVDFBDDFF\r\n") + QStringLiteral("Upgrade: websocket\r\n") + QStringLiteral("Connection: Upgrade\r\n\r\n"); - request.readHandshake(input); + request.readHandshake(input, 8 * 1024, 100); QWebSocketHandshakeResponse response(request, "example.com", true, QList<QWebSocketProtocol::Version>() << QWebSocketProtocol::Version13, |