diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:17:49 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:17:49 +0200 |
| commit | f78a7049271e59238acfcad58fb4f7183d92cd1f (patch) | |
| tree | b87d1bf5a7a16a126a5d07e629aae591e1d27e4f /tests/auto | |
| parent | 258d019df60bc346a6fa89da694e52c4743dc18b (diff) | |
| parent | 8b9836d0e00736b5a16f650667218612940e106b (diff) | |
| download | qtwebsockets-f78a7049271e59238acfcad58fb4f7183d92cd1f.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Iff68a7da2065b64579032f1be8eaf5fb097d58bb
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/handshakerequest/tst_handshakerequest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/handshakerequest/tst_handshakerequest.cpp b/tests/auto/handshakerequest/tst_handshakerequest.cpp index 4302e13..e4dbf05 100644 --- a/tests/auto/handshakerequest/tst_handshakerequest.cpp +++ b/tests/auto/handshakerequest/tst_handshakerequest.cpp @@ -159,14 +159,14 @@ void tst_HandshakeRequest::tst_invalidStream_data() //this test checks if there doesn't occur an out-of-bounds exception QTest::newRow("Correctly formatted but invalid short fields") << QStringLiteral("V R P"); QTest::newRow("Invalid \\0 character in header") << QStringLiteral("V R\0 P"); - QTest::newRow("Invalid http version in header") << QStringLiteral("V R HTTP/invalid"); + QTest::newRow("Invalid HTTP version in header") << QStringLiteral("V R HTTP/invalid"); QTest::newRow("Empty header field") << QStringLiteral("GET . HTTP/1.1\r\nHEADER: "); QTest::newRow("All zeros") << QString::fromUtf8(QByteArray(10, char(0))); QTest::newRow("Invalid hostname") << QStringLiteral("GET . HTTP/1.1\r\nHost: \xFF\xFF"); //doing extensive QStringLiteral concatenations here, because //MSVC 2010 complains when using concatenation literal strings about //concatenation of wide and narrow strings (error C2308) - QTest::newRow("Complete header - Invalid websocket version") + QTest::newRow("Complete header - Invalid WebSocket version") << QStringLiteral("GET . HTTP/1.1\r\nHost: foo\r\nSec-WebSocket-Version: ") + QStringLiteral("\xFF\xFF\r\n") + QStringLiteral("Sec-WebSocket-Key: AVDFBDDFF\r\n") + @@ -177,7 +177,7 @@ void tst_HandshakeRequest::tst_invalidStream_data() QStringLiteral("Sec-WebSocket-Key: AVDFBDDFF\r\n") + QStringLiteral("Upgrade: websocket\r\n") + QStringLiteral("Connection: Upgrade\r\n\r\n"); - QTest::newRow("Complete header - Invalid http version") + QTest::newRow("Complete header - Invalid HTTP version") << QStringLiteral("GET . HTTP/a.1\r\nHost: foo\r\nSec-WebSocket-Version: 13\r\n") + QStringLiteral("Sec-WebSocket-Key: AVDFBDDFF\r\n") + QStringLiteral("Upgrade: websocket\r\n") + |