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

[Michael Meeks]

 loolwsd/LOOLWSD.cpp |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit da76cffc0df9f7ec8bc3df05e0c49e9f2bc8d647
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Nov 2 00:42:56 2016 +0000

    loolwsd: Better fix for 'Address already in use' vs. 86383d40db

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 1eb68e3..1907cf3 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1320,9 +1320,7 @@ static inline ServerSocket* getServerSocket(int nClientPortNumber)
         ServerSocket* socket = LOOLWSD::isSSLEnabled() ? new SecureServerSocket() : new ServerSocket();
         Poco::Net::IPAddress wildcardAddr;
         SocketAddress address(wildcardAddr, nClientPortNumber);
-        socket->init(address.af());
-        socket->setReuseAddress(true);
-        socket->bind(address, false);
+        socket->bind(address, true);
         // 64 is the default value for the backlog parameter in Poco
         // when creating a ServerSocket, so use it here, too.
         socket->listen(64);