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

[Miklos Vajna]

 loolwsd/LOOLWSD.cpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 700b7d08b7e80826a918e8095815bf888b5f74d2
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Oct 16 15:23:49 2015 +0200

    loolwsd: allow frame size of 200K
    
    I got:
    
    WebSocketException: Insufficient buffer for payload size 113579
    
    So double the allocated size: that seems to help.

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index ac36945..3cc510c 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -262,7 +262,7 @@ public:
                 ws->setReceiveTimeout(0);
                 do
                 {
-                    char buffer[100000];
+                    char buffer[200000];
                     n = ws->receiveFrame(buffer, sizeof(buffer), flags);
 
                     if (n > 0 && (flags & WebSocket::FRAME_OP_BITMASK) != WebSocket::FRAME_OP_CLOSE)
@@ -316,7 +316,7 @@ public:
             }
             catch (WebSocketException& exc)
             {
-                Application::instance().logger().error(Util::logPrefix() + "WebSocketException: " + exc.message());
+                Application::instance().logger().error(Util::logPrefix() + "RequestHandler::handleRequest(), WebSocketException: " + exc.message());
                 switch (exc.code())
                 {
                 case WebSocket::WS_ERR_HANDSHAKE_UNSUPPORTED_VERSION:
@@ -384,7 +384,7 @@ public:
         {
             do
             {
-                char buffer[100000];
+                char buffer[200000];
                 n = _ws.receiveFrame(buffer, sizeof(buffer), flags);
 
                 if (n > 0 && (flags & WebSocket::FRAME_OP_BITMASK) != WebSocket::FRAME_OP_CLOSE)
@@ -399,7 +399,7 @@ public:
         }
         catch (WebSocketException& exc)
         {
-            Application::instance().logger().error(Util::logPrefix() + "WebSocketException: " + exc.message());
+            Application::instance().logger().error(Util::logPrefix() + "TestOutput::run(), WebSocketException: " + exc.message());
             _ws.close();
         }
     }