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

Ashod Nakashian ashod.nakashian at collabora.co.uk
Mon Feb 20 03:51:30 UTC 2017


 net/socket.hpp |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit c48bd4e914f3a5f378f08ba028bcfc14aa54b221
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun Feb 19 12:30:49 2017 -0500

    nb: handle as many incoming messages as ready
    
    Change-Id: I082f4a8b86b1f1827e4fba6927248bc6bd2cb1fa
    Reviewed-on: https://gerrit.libreoffice.org/34443
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/net/socket.hpp b/net/socket.hpp
index 1a6c4a1..6f7686b 100644
--- a/net/socket.hpp
+++ b/net/socket.hpp
@@ -300,10 +300,11 @@ public:
         // FIXME: need to close input, but not output (?)
         if (events & POLLIN)
         {
-            const size_t oldSize = _inBuffer.size();
+            size_t oldSize = _inBuffer.size();
             closeSocket = !readIncomingData();
-            if (oldSize != _inBuffer.size())
+            while (oldSize != _inBuffer.size())
             {
+                oldSize = _inBuffer.size();
                 handleIncomingMessage();
             }
         }


More information about the Libreoffice-commits mailing list