diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-04-20 19:09:04 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-04-20 19:42:39 +0300 |
| commit | 2de92430efa91fec0fddcec9be0755a69ca4f7b5 (patch) | |
| tree | af0366c5f376d2048c20b67cc5ca33ec65aa5e3f | |
| parent | 45b5ac72b2384ea370e4138e08c4c8344d94b4e3 (diff) | |
Revert "SL-15141 Update CURL to 7.76.1" due to OPS-4251
This reverts commit 45b5ac72b2384ea370e4138e08c4c8344d94b4e3 and updates curl links
| -rw-r--r-- | autobuild.xml | 14 | ||||
| -rw-r--r-- | indra/newview/llxmlrpclistener.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llxmlrpctransaction.cpp | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/autobuild.xml b/autobuild.xml index 1645fae351..490089752b 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -398,9 +398,9 @@ <key>archive</key> <map> <key>hash</key> - <string>b9929a96097f09cc433484092cddf760</string> + <string>52fc837a5840f5e6991842cf2f73a9d7</string> <key>url</key> - <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/80348/758363/curl-7.76.1.558412-darwin64-558412.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/80409/758717/curl-7.54.1.558452-darwin64-558452.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -434,11 +434,11 @@ <key>archive</key> <map> <key>hash</key> - <string>17b3f80f28c3d58632abd7ae5144a93d</string> + <string>8de0af7c8168406bf18bdcd5bc44e40e</string> <key>hash_algorithm</key> <string>md5</string> <key>url</key> - <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/80349/758380/curl-7.76.1.558412-windows-558412.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/80411/758714/curl-7.54.1.558452-windows-558452.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -448,16 +448,16 @@ <key>archive</key> <map> <key>hash</key> - <string>17b64a8997755ecc0e3d0dd4d6e76b5d</string> + <string>dc633acdbd3595db4f904e68e48b4744</string> <key>url</key> - <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/80350/758379/curl-7.76.1.558412-windows64-558412.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/80410/758715/curl-7.54.1.558452-windows64-558452.tar.bz2</string> </map> <key>name</key> <string>windows64</string> </map> </map> <key>version</key> - <string>7.76.1.558412</string> + <string>7.54.1.558452</string> </map> <key>db</key> <map> diff --git a/indra/newview/llxmlrpclistener.cpp b/indra/newview/llxmlrpclistener.cpp index 1053059a33..bae615232e 100644 --- a/indra/newview/llxmlrpclistener.cpp +++ b/indra/newview/llxmlrpclistener.cpp @@ -344,7 +344,7 @@ public: switch (curlcode) { case CURLE_SSL_PEER_CERTIFICATE: - // same value as CURLE_SSL_CACERT: + case CURLE_SSL_CACERT: data["certificate"] = mTransaction->getErrorCertData(); break; diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp index 1af4588240..32c8ce66a0 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; |