From 45b5ac72b2384ea370e4138e08c4c8344d94b4e3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 20 Apr 2021 01:07:53 +0300
Subject: SL-15141 Update CURL to 7.76.1

CURLE_SSL_CACERT is now identical to CURLE_SSL_PEER_CERTIFICATE
---
 autobuild.xml                         | 14 +++++++-------
 indra/newview/llxmlrpclistener.cpp    |  2 +-
 indra/newview/llxmlrpctransaction.cpp |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 6c43fa7bc2..1645fae351 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -398,9 +398,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>7295ca3234ab21a98c39604f3b0985cb</string>
+              <string>b9929a96097f09cc433484092cddf760</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/78596/744055/curl-7.54.1.557049-darwin64-557049.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/80348/758363/curl-7.76.1.558412-darwin64-558412.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -434,11 +434,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>0c31fa12a33ecc946c0c69259b6367a9</string>
+              <string>17b3f80f28c3d58632abd7ae5144a93d</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/78598/744050/curl-7.54.1.557049-windows-557049.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/80349/758380/curl-7.76.1.558412-windows-558412.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -448,16 +448,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>4c4d5971a59ae2e1f4467667df2a9aa4</string>
+              <string>17b64a8997755ecc0e3d0dd4d6e76b5d</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/78597/744044/curl-7.54.1.557049-windows64-557049.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/80350/758379/curl-7.76.1.558412-windows64-558412.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>7.54.1.557049</string>
+        <string>7.76.1.558412</string>
       </map>
       <key>db</key>
       <map>
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;
-- 
cgit v1.2.3