strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

'Handshake' is one word

Browse source 
Change-Id: Ibef905cc42a74052738a71bd4743431e30b863d1
This commit is contained in:
Tor Lillqvist 2017-01-02 13:29:09 +02:00
parent 9680a13af3
commit f94d4c789d
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/httpwstest.cpp
View file

@ -59,7 +59,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
CPPUNIT_TEST_SUITE(HTTPWSTest); CPPUNIT_TEST_SUITE(HTTPWSTest);
CPPUNIT_TEST(testBadRequest); CPPUNIT_TEST(testBadRequest);
CPPUNIT_TEST(testHandShake); CPPUNIT_TEST(testHandshake);
CPPUNIT_TEST(testCloseAfterClose); CPPUNIT_TEST(testCloseAfterClose);
CPPUNIT_TEST(testConnectNoLoad); // This fails most of the times but occasionally succeeds CPPUNIT_TEST(testConnectNoLoad); // This fails most of the times but occasionally succeeds
CPPUNIT_TEST(testLoad); CPPUNIT_TEST(testLoad);
@ -106,7 +106,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
void testCountHowManyLoolkits(); void testCountHowManyLoolkits();
void testBadRequest(); void testBadRequest();
void testHandShake(); void testHandshake();
void testCloseAfterClose(); void testCloseAfterClose();
void testConnectNoLoad(); void testConnectNoLoad();
void testLoad(); void testLoad();
@ -250,7 +250,7 @@ void HTTPWSTest::testBadRequest()
} }
} }
void HTTPWSTest::testHandShake() void HTTPWSTest::testHandshake()
{ {
try try
{ {

2
wsd/LOOLWSD.cpp
View file

@ -1137,7 +1137,7 @@ public:
{ {
--LOOLWSD::NumConnections; --LOOLWSD::NumConnections;
LOG_ERR("Limit on maximum number of connections of " << MAX_CONNECTIONS << " reached."); LOG_ERR("Limit on maximum number of connections of " << MAX_CONNECTIONS << " reached.");
// accept hand shake // accept handshake
LOOLWebSocket ws(request, response); LOOLWebSocket ws(request, response);
shutdownLimitReached(ws); shutdownLimitReached(ws);
return; return;