[Libreoffice-commits] online.git: test/httpwstest.cpp wsd/LOOLWSD.cpp

[Tor Lillqvist]

 test/httpwstest.cpp |    6 +++---
 wsd/LOOLWSD.cpp     |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f94d4c789dceed7c689608a19b9f3d1924ef5282
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Jan 2 13:29:09 2017 +0200

    'Handshake' is one word
    
    Change-Id: Ibef905cc42a74052738a71bd4743431e30b863d1

diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index 066a5b7..1d078e4 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -59,7 +59,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST_SUITE(HTTPWSTest);
 
     CPPUNIT_TEST(testBadRequest);
-    CPPUNIT_TEST(testHandShake);
+    CPPUNIT_TEST(testHandshake);
     CPPUNIT_TEST(testCloseAfterClose);
     CPPUNIT_TEST(testConnectNoLoad); // This fails most of the times but occasionally succeeds
     CPPUNIT_TEST(testLoad);
@@ -106,7 +106,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
 
     void testCountHowManyLoolkits();
     void testBadRequest();
-    void testHandShake();
+    void testHandshake();
     void testCloseAfterClose();
     void testConnectNoLoad();
     void testLoad();
@@ -250,7 +250,7 @@ void HTTPWSTest::testBadRequest()
     }
 }
 
-void HTTPWSTest::testHandShake()
+void HTTPWSTest::testHandshake()
 {
     try
     {
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 3c43672..cbe8c26 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1137,7 +1137,7 @@ public:
         {
             --LOOLWSD::NumConnections;
             LOG_ERR("Limit on maximum number of connections of " << MAX_CONNECTIONS << " reached.");
-            // accept hand shake
+            // accept handshake
             LOOLWebSocket ws(request, response);
             shutdownLimitReached(ws);
             return;