highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-19 06:43:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove path.make_preferred() calls, and fix compiler error in bitcoinrpc RE: boost::system

Browse Source
This commit is contained in:
Gavin Andresen
2012-04-11 14:00:48 -04:00
parent 37e7e72041
commit 2232717cba
3 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/bitcoinrpc.cpp
View File

@@ -2384,7 +2384,7 @@ void ThreadRPCServer2(void* parg)
acceptor.bind(endpoint);
acceptor.listen(socket_base::max_connections);
}
catch(system::system_error &e)
catch(boost::system::system_error &e)
{
ThreadSafeMessageBox(strprintf(_("An error occured while setting up the RPC port %i for listening: %s"), endpoint.port(), e.what()),
_("Error"), wxOK | wxMODAL);
@@ -2399,13 +2399,11 @@ void ThreadRPCServer2(void* parg)
filesystem::path pathCertFile(GetArg("-rpcsslcertificatechainfile", "server.cert"));
if (!pathCertFile.is_complete()) pathCertFile = filesystem::path(GetDataDir()) / pathCertFile;
pathCertFile.make_preferred();
if (filesystem::exists(pathCertFile)) context.use_certificate_chain_file(pathCertFile.string().c_str());
else printf("ThreadRPCServer ERROR: missing server certificate file %s\n", pathCertFile.string().c_str());
filesystem::path pathPKFile(GetArg("-rpcsslprivatekeyfile", "server.pem"));
if (!pathPKFile.is_complete()) pathPKFile = filesystem::path(GetDataDir()) / pathPKFile;
pathPKFile.make_preferred();
if (filesystem::exists(pathPKFile)) context.use_private_key_file(pathPKFile.string().c_str(), ssl::context::pem);
else printf("ThreadRPCServer ERROR: missing server private key file %s\n", pathPKFile.string().c_str());