diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-04-03 18:56:46 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-04-03 18:56:46 -0400 |
| commit | d7481cd07c3e0b5eed54ff6a3539406d09ed0669 (patch) | |
| tree | 7e0d2a2a9733784f16518b977423deb225021651 /indra/llmessage/llcurl.cpp | |
| parent | 076761a03d7cb8b53e6e3d4f2120091eabeba37a (diff) | |
| parent | 31a3a3da5db077c4d9b8fe06a18de98c822db6ab (diff) | |
Merge. Refresh from viewer-release after 3.7.4 release.
Diffstat (limited to 'indra/llmessage/llcurl.cpp')
| -rwxr-xr-x | indra/llmessage/llcurl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp index efbc804cbc..9e68c68858 100755 --- a/indra/llmessage/llcurl.cpp +++ b/indra/llmessage/llcurl.cpp @@ -296,7 +296,7 @@ LLCurl::Easy* LLCurl::Easy::getEasy() // Enable a brief cache period for now. This was zero for the longest time // which caused some routers grief and generated unneeded traffic. For the - // threded resolver, we're using system resolution libraries and non-zero values + // threaded resolver, we're using system resolution libraries and non-zero values // are preferred. The c-ares resolver is another matter and it might not // track server changes as well. CURLcode result = curl_easy_setopt(easy->mCurlEasyHandle, CURLOPT_DNS_CACHE_TIMEOUT, 15); @@ -1741,6 +1741,7 @@ void LLCurl::cleanupClass() #if SAFE_SSL CRYPTO_set_locking_callback(NULL); for_each(sSSLMutex.begin(), sSSLMutex.end(), DeletePointer()); + sSSLMutex.clear(); #endif LL_CHECK_MEMORY |