Merge branch 'master' of https://github.com/sandos/bitcoin into sandos-master

This commit is contained in:
tcatm 2011-02-23 01:07:43 +01:00
commit 10e135af70

View File

@ -1710,6 +1710,8 @@ void ThreadRPCServer2(void* parg)
ip::tcp::endpoint endpoint(bindAddress, GetArg("-rpcport", 8332)); ip::tcp::endpoint endpoint(bindAddress, GetArg("-rpcport", 8332));
ip::tcp::acceptor acceptor(io_service, endpoint); ip::tcp::acceptor acceptor(io_service, endpoint);
acceptor.set_option(boost::asio::ip::tcp::acceptor::reuse_address(true));
#ifdef USE_SSL #ifdef USE_SSL
ssl::context context(io_service, ssl::context::sslv23); ssl::context context(io_service, ssl::context::sslv23);
if (fUseSSL) if (fUseSSL)