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

[Ashod Nakashian]

 wsd/LOOLWSD.cpp |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 2e16fd28524a7533efe6190a7bab13e2836f48af
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sat Mar 11 13:36:35 2017 -0500

    nb: don't read socket data without handling
    
    When we read data, we must also handle it,
    otherwise the next poll might have no
    more data (the request data was read
    completely the first time) and we dead
    lock waiting for data to process.
    
    Change-Id: I26c69ecc1f0550e8371cf77a6f3928a7a877eff7
    Reviewed-on: https://gerrit.libreoffice.org/35080
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 7eafcdf..cdf6518 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2307,13 +2307,7 @@ class SslSocketFactory : public SocketFactory
 {
     std::shared_ptr<Socket> create(const int fd) override
     {
-        auto socket = StreamSocket::create<SslStreamSocket>(fd, std::unique_ptr<SocketHandlerInterface>{ new ClientRequestDispatcher });
-
-        // Do the ssl handshake and read the request.
-        // TODO is this really necessary?  This goes against how the polling &
-        // buffering is done in the generic / non-ssl case...
-        socket->readIncomingData();
-        return socket;
+        return StreamSocket::create<SslStreamSocket>(fd, std::unique_ptr<SocketHandlerInterface>{ new ClientRequestDispatcher });
     }
 };
 #endif