summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-04-20 01:07:53 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-04-20 02:12:16 +0300
commit45b5ac72b2384ea370e4138e08c4c8344d94b4e3 (patch)
tree2d381763395b7ee922c6e3952103ace8582171a2 /indra/newview
parent680f2cfee6210f2526f572a996fc18adeadc4b76 (diff)
SL-15141 Update CURL to 7.76.1
CURLE_SSL_CACERT is now identical to CURLE_SSL_PEER_CERTIFICATE
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llxmlrpclistener.cpp2
-rw-r--r--indra/newview/llxmlrpctransaction.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llxmlrpclistener.cpp b/indra/newview/llxmlrpclistener.cpp
index bae615232e..1053059a33 100644
--- a/indra/newview/llxmlrpclistener.cpp
+++ b/indra/newview/llxmlrpclistener.cpp
@@ -344,7 +344,7 @@ public:
switch (curlcode)
{
case CURLE_SSL_PEER_CERTIFICATE:
- case CURLE_SSL_CACERT:
+ // same value as CURLE_SSL_CACERT:
data["certificate"] = mTransaction->getErrorCertData();
break;
diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp
index 32c8ce66a0..1af4588240 100644
--- a/indra/newview/llxmlrpctransaction.cpp
+++ b/indra/newview/llxmlrpctransaction.cpp
@@ -499,10 +499,10 @@ void LLXMLRPCTransaction::Impl::setHttpStatus(const LLCore::HttpStatus &status)
break;
case CURLE_SSL_PEER_CERTIFICATE:
+ // same value as CURLE_SSL_CACERT:
message = LLTrans::getString("ssl_peer_certificate");
break;
- case CURLE_SSL_CACERT:
case CURLE_SSL_CONNECT_ERROR:
message = LLTrans::getString("ssl_connect_error");
break;