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

[Michael Meeks (via logerrit)]

 wsd/LOOLWSD.cpp |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 54ed949a20a8c10f8a03acc3939be1bc5f2700f7
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Mon May 25 16:33:25 2020 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Mon May 25 17:53:54 2020 +0200

    insertfile - close socket after inserting.
    
    Can fix hangs on insertion where the read side of the socket is
    done sending, but not yet closed.
    
    Change-Id: Ib2e943699e54a3d566434a46200402b8ec4937e0
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94798
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index c7ff6572f..aa3a6be1d 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2813,6 +2813,7 @@ private:
                     handler.takeFile();
                     response.setContentLength(0);
                     socket->send(response);
+                    socket->shutdown();
                     return;
                 }
             }