[Libreoffice-commits] online.git: Branch 'private/Ashod/nonblocking' - net/WebSocketHandler.hpp

[Michael Meeks]

 net/WebSocketHandler.hpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit c803fb129d9a00d41ed8132e93029cfe2d6c5a4f
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Mon Feb 27 14:34:48 2017 +0000

    Add debug, and set the 'fin' bit on messages as we send them.

diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
index d76e6aa..d4b6073 100644
--- a/net/WebSocketHandler.hpp
+++ b/net/WebSocketHandler.hpp
@@ -116,6 +116,8 @@ public:
         socket->_inBuffer.erase(socket->_inBuffer.begin(), socket->_inBuffer.begin() + headerLen + payloadLen);
 
         // FIXME: fin, aggregating payloads into _wsPayload etc.
+        LOG_TRC("Incoming WebSocket message code " << code << " fin? " << fin << " payload length " << _wsPayload.size());
+
         handleMessage(fin, code, _wsPayload);
         _wsPayload.clear();
     }
@@ -132,7 +134,7 @@ public:
         if (socket == nullptr)
             return 0; // no socket == connection closed.
 
-        bool fin = false;
+        bool fin = true;
         bool mask = false;
 
         auto lock = socket->getWriteLock();