summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-10-04 21:26:05 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-10-04 21:26:05 +0300
commit9a107192504a75b8d3ee61dfeca02f4f4031699d (patch)
tree52fd3d391afa2f3bfb341e3df26902b98e16b052 /indra
parent47993954923cab94a6b93ce605e0c71d007076f7 (diff)
SL-16125 Crash in sslVerify on shutdown
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llappcorehttp.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llappcorehttp.cpp b/indra/newview/llappcorehttp.cpp
index 3da87e657c..fb1366dff4 100644
--- a/indra/newview/llappcorehttp.cpp
+++ b/indra/newview/llappcorehttp.cpp
@@ -546,6 +546,11 @@ void LLAppCoreHttp::refreshSettings(bool initial)
LLCore::HttpStatus LLAppCoreHttp::sslVerify(const std::string &url,
const LLCore::HttpHandler::ptr_t &handler, void *appdata)
{
+ if (gDisconnected)
+ {
+ return LLCore::HttpStatus(LLCore::HttpStatus::EXT_CURL_EASY, CURLE_OPERATION_TIMEDOUT);
+ }
+
LLCore::HttpStatus result;
try
{