[Libreoffice-commits] online.git: kit/Kit.cpp

Jan Holesovsky kendy at collabora.com
Wed Feb 8 23:10:30 UTC 2017


 kit/Kit.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 963aeb5d1fb06dd0360f73ffb3f0ea3ab19ec794
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Feb 9 00:07:43 2017 +0100

    Don't leak children that did not manage to send their PID to wsd.

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index ae56b6e..4ab1da3 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -1758,7 +1758,7 @@ void lokit_main(const std::string& childRoot,
 
         // Open websocket connection between the child process and WSD.
         HTTPClientSession cs("127.0.0.1", MasterPortNumber);
-        cs.setTimeout(0);
+        cs.setTimeout(Poco::Timespan(10, 0)); // 10 second
         HTTPRequest request(HTTPRequest::HTTP_GET, requestUrl);
         HTTPResponse response;
         auto ws = std::make_shared<LOOLWebSocket>(cs, request, response);


More information about the Libreoffice-commits mailing list