summaryrefslogtreecommitdiff
path: root/indra/llcorehttp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-10-14 01:01:09 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-10-14 01:01:09 +0300
commit20e05a5c11ddf64d437fb44ecd548920bd8a3163 (patch)
tree81dc1be6c4504209c4cc173dca223307c2d44130 /indra/llcorehttp
parentca629c362c5ed248547f9df057703079c95331e7 (diff)
parentcbaba2df56c66926e051d50b6cb02955c81c2a6c (diff)
Merge branch master (DRTVWR-520) into DRTVWR-542-meshopt
Diffstat (limited to 'indra/llcorehttp')
-rw-r--r--indra/llcorehttp/CMakeLists.txt1
-rw-r--r--indra/llcorehttp/httpcommon.cpp58
2 files changed, 0 insertions, 59 deletions
diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt
index 8bb6a657b1..6a301ad50d 100644
--- a/indra/llcorehttp/CMakeLists.txt
+++ b/indra/llcorehttp/CMakeLists.txt
@@ -177,7 +177,6 @@ if (DARWIN)
set(copy_dylibs
libapr-1.0.dylib
libaprutil-1.0.dylib
- libexception_handler.dylib
libnghttp2*.dylib
liburiparser*.dylib
${EXPAT_COPY}
diff --git a/indra/llcorehttp/httpcommon.cpp b/indra/llcorehttp/httpcommon.cpp
index e37a38b05f..61ba83594e 100644
--- a/indra/llcorehttp/httpcommon.cpp
+++ b/indra/llcorehttp/httpcommon.cpp
@@ -23,13 +23,6 @@
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
-#if LL_WINDOWS
-#define SAFE_SSL 1
-#elif LL_DARWIN
-#define SAFE_SSL 1
-#else
-#define SAFE_SSL 1
-#endif
#include "linden_common.h" // Modifies curl/curl.h interfaces
#include "httpcommon.h"
@@ -38,10 +31,6 @@
#include <curl/curl.h>
#include <string>
#include <sstream>
-#if SAFE_SSL
-#include <openssl/crypto.h>
-#include <functional> // std::hash
-#endif
namespace LLCore
@@ -281,9 +270,6 @@ namespace LLHttp
{
namespace
{
-typedef boost::shared_ptr<LLMutex> LLMutex_ptr;
-std::vector<LLMutex_ptr> sSSLMutex;
-
CURL *getCurlTemplateHandle()
{
static CURL *curlpTemplateHandle = NULL;
@@ -348,34 +334,6 @@ void deallocateEasyCurl(CURL *curlp)
}
-#if SAFE_SSL
-//static
-void ssl_locking_callback(int mode, int type, const char *file, int line)
-{
- if (type >= sSSLMutex.size())
- {
- LL_WARNS() << "Attempt to get unknown MUTEX in SSL Lock." << LL_ENDL;
- }
-
- if (mode & CRYPTO_LOCK)
- {
- sSSLMutex[type]->lock();
- }
- else
- {
- sSSLMutex[type]->unlock();
- }
-}
-
-//static
-unsigned long ssl_thread_id(void)
-{
- // std::thread::id is very deliberately opaque, but we can hash it
- return std::hash<LLThread::id_t>()(LLThread::currentID());
-}
-#endif
-
-
}
void initialize()
@@ -387,27 +345,11 @@ void initialize()
check_curl_code(code, CURL_GLOBAL_ALL);
-#if SAFE_SSL
- S32 mutex_count = CRYPTO_num_locks();
- for (S32 i = 0; i < mutex_count; i++)
- {
- sSSLMutex.push_back(LLMutex_ptr(new LLMutex()));
- }
- CRYPTO_set_id_callback(&ssl_thread_id);
- CRYPTO_set_locking_callback(&ssl_locking_callback);
-#endif
-
}
void cleanup()
{
-#if SAFE_SSL
- CRYPTO_set_id_callback(NULL);
- CRYPTO_set_locking_callback(NULL);
- sSSLMutex.clear();
-#endif
-
curl_global_cleanup();
}