From 5d2431014807009b2c6f72cc94166eb561e50a7d Mon Sep 17 00:00:00 2001 From: Jorg Knobloch Date: Tue, 23 Jun 2020 23:38:49 +0200 Subject: [PATCH] revert to rev 49fe188132 and pass reuse_addr==false to CTOR of _acceptor --- webserver.cc | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/webserver.cc b/webserver.cc index a426feb..cc6f382 100644 --- a/webserver.cc +++ b/webserver.cc @@ -14,7 +14,7 @@ namespace fs = boost::filesystem; namespace pEp { Webserver::Webserver(net::ip::address addr, unsigned short port, const std::string& doc_root) : _ioc{1} - , _acceptor{_ioc, {addr, port}} + , _acceptor{_ioc, {addr, port}, false} , _doc_root{doc_root} , _generic_handler{} , _port{port} @@ -231,21 +231,9 @@ the_end: void Webserver::runner(Webserver *me) { - boost::asio::socket_base::keep_alive keep_alive(true); - boost::asio::socket_base::reuse_address reuse_address(false); - while (me->_running) { tcp::socket* socket = new tcp::socket{me->_ioc}; - me->_acceptor.set_option(keep_alive); - me->_acceptor.set_option(reuse_address); - -#ifdef WiN32 - int fd = me->_acceptor.native_handle(); - BOOL value = 1; - setsockopt(fd, SOL_SOCKET, SO_EXCLUSIVEADDRUSE, &value, sizeof(BOOL)); -#endif - me->_acceptor.accept(*socket); std::function< void() > tf = [=]()