livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fail in initialization if there is no CA bundle (instead of waiting for an opaque connection failure)

master
Oz Linden 2016-07-28 13:21:04 -04:00
parent ba93f428e3
commit 2be32eedb5
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llappcorehttp.cpp
View File

@ -154,9 +154,19 @@ void LLAppCoreHttp::init()
}
// Point to our certs or SSH/https: will fail on connect
status = LLCore::HttpRequest::setStaticPolicyOption(LLCore::HttpRequest::PO_CA_FILE,
LLCore::HttpRequest::GLOBAL_POLICY_ID,
gDirUtilp->getCAFile(), NULL);
std::string ca_file = gDirUtilp->getCAFile();
if ( LLFile::isfile(ca_file) )
{
LL_DEBUGS("Init") << "Setting CA File to " << ca_file << LL_ENDL;
status = LLCore::HttpRequest::setStaticPolicyOption(LLCore::HttpRequest::PO_CA_FILE,
LLCore::HttpRequest::GLOBAL_POLICY_ID,
ca_file, NULL);
}
else
{
LL_ERRS("Init") << "Missing CA File; should be at " << ca_file << LL_ENDL;
}
if (! status)
{
LL_ERRS("Init") << "Failed to set CA File for HTTP services. Reason: " << status.toString()