summaryrefslogtreecommitdiff
path: root/indra/newview/llappcorehttp.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2018-02-13 13:58:23 +0000
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2018-02-13 13:58:23 +0000
commit2b7966302131975e8d270bbf2985b678f37d4b24 (patch)
tree69d01a92eeaa5de292673bc4506f1d0932d3d607 /indra/newview/llappcorehttp.cpp
parentdec077e54a21ccda7d7cc0b610a87eacfd36af09 (diff)
parent5510b589b136d354ce2975c45f41ccc7e66e9d21 (diff)
merge
Diffstat (limited to 'indra/newview/llappcorehttp.cpp')
-rw-r--r--indra/newview/llappcorehttp.cpp26
1 files changed, 17 insertions, 9 deletions
diff --git a/indra/newview/llappcorehttp.cpp b/indra/newview/llappcorehttp.cpp
index 261a7b5ad9..afa4414968 100644
--- a/indra/newview/llappcorehttp.cpp
+++ b/indra/newview/llappcorehttp.cpp
@@ -157,9 +157,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()
@@ -540,9 +550,8 @@ LLCore::HttpStatus LLAppCoreHttp::sslVerify(const std::string &url,
// error codes. Should be refactored with login refactoring, perhaps.
result = LLCore::HttpStatus(LLCore::HttpStatus::EXT_CURL_EASY, CURLE_SSL_CACERT);
result.setMessage(cert_exception.what());
- LLPointer<LLCertificate> cert = cert_exception.getCert();
- cert->ref(); // adding an extra ref here
- result.setErrorData(cert.get());
+ LLSD certdata = cert_exception.getCertData();
+ result.setErrorData(certdata);
// We should probably have a more generic way of passing information
// back to the error handlers.
}
@@ -550,9 +559,8 @@ LLCore::HttpStatus LLAppCoreHttp::sslVerify(const std::string &url,
{
result = LLCore::HttpStatus(LLCore::HttpStatus::EXT_CURL_EASY, CURLE_SSL_PEER_CERTIFICATE);
result.setMessage(cert_exception.what());
- LLPointer<LLCertificate> cert = cert_exception.getCert();
- cert->ref(); // adding an extra ref here
- result.setErrorData(cert.get());
+ LLSD certdata = cert_exception.getCertData();
+ result.setErrorData(certdata);
}
catch (...)
{