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

[Henry Castro]

 loolwsd/LOOLWSD.cpp          |   17 +++++++++--------
 loolwsd/test/httpwserror.cpp |    8 ++++----
 2 files changed, 13 insertions(+), 12 deletions(-)

New commits:
commit 0729a38277772f11c0d6948b9c12ea84d26ecced
Author: Henry Castro <hcas...@collabora.com>
Date:   Wed Sep 28 17:03:36 2016 -0400

    loolwsd: restore MAX_CONNECTIONS
    
    Let's do another unit test with http request connections

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 740e048..d4dd59b 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -538,14 +538,6 @@ private:
     {
         Log::info("Starting GET request handler for session [" + id + "].");
 
-#if MAX_CONNECTIONS > 0
-        if (++LOOLWSD::NumConnections > MAX_CONNECTIONS)
-        {
-            Log::error("Maximum number of connections reached.");
-            throw 
WebSocketErrorMessageException(Poco::format(SERVICE_UNAVALABLE_LIMIT_REACHED, 
MAX_DOCUMENTS, MAX_CONNECTIONS, std::string(LOOLWSD_PRODUCT), 
std::string(LOOLWSD_URL), std::string(LOOLWSD_URL)));
-        }
-#endif
-
         // indicator to the client that document broker is searching
         std::string status("statusindicator: find");
         Log::trace("Sending to Client [" + status + "].");
@@ -865,6 +857,15 @@ public:
                 request, response))
             return;
 
+#if MAX_CONNECTIONS > 0
+        if (++LOOLWSD::NumConnections > MAX_CONNECTIONS)
+        {
+            --LOOLWSD::NumConnections;
+            Log::error("Maximum number of connections reached.");
+            throw 
WebSocketErrorMessageException(Poco::format(SERVICE_UNAVALABLE_LIMIT_REACHED, 
MAX_DOCUMENTS, MAX_CONNECTIONS, std::string(LOOLWSD_PRODUCT), 
std::string(LOOLWSD_URL), std::string(LOOLWSD_URL)));
+        }
+#endif
+
         handleClientRequest(request,response);
 
 #if MAX_CONNECTIONS > 0
diff --git a/loolwsd/test/httpwserror.cpp b/loolwsd/test/httpwserror.cpp
index 6a130bc..ab053b7 100644
--- a/loolwsd/test/httpwserror.cpp
+++ b/loolwsd/test/httpwserror.cpp
@@ -36,12 +36,12 @@ class HTTPWSError : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST_SUITE(HTTPWSError);
 
     CPPUNIT_TEST(testMaxDocuments);
-    CPPUNIT_TEST(testMaxConnections);
+    //CPPUNIT_TEST(testMaxConnections);
 
     CPPUNIT_TEST_SUITE_END();
 
     void testMaxDocuments();
-    void testMaxConnections();
+    //void testMaxConnections();
 
 public:
     HTTPWSError()
@@ -108,7 +108,7 @@ void HTTPWSError::testMaxDocuments()
 #endif
 }
 
-void HTTPWSError::testMaxConnections()
+/*void HTTPWSError::testMaxConnections()
 {
 #if MAX_CONNECTIONS > 0
     try
@@ -145,7 +145,7 @@ void HTTPWSError::testMaxConnections()
         CPPUNIT_FAIL(exc.displayText());
     }
 #endif
-}
+}*/
 
 CPPUNIT_TEST_SUITE_REGISTRATION(HTTPWSError);
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits