From 6e200800eddc374419d6e0e42b9ef63813ddf70f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 17 Mar 2021 00:19:38 +0200
Subject: SL-14541 removed breakpad, win_crash_logger

# Conflicts:
#	autobuild.xml
#	indra/CMakeLists.txt
#	indra/newview/CMakeLists.txt
#	indra/newview/llappviewerwin32.h
#	indra/win_crash_logger/llcrashloggerwindows.cpp
Cherry picked from DRTVWR-520
---
 indra/llcorehttp/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/llcorehttp')

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}
-- 
cgit v1.2.3


From 5af8f15a0579bc88ca4249324db8b1f19c52bbd5 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 8 Sep 2021 20:53:50 +0300
Subject: SL-14541 Replace zlib with zlib-ng

---
 indra/llcorehttp/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llcorehttp')

diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt
index 6a301ad50d..c591680250 100644
--- a/indra/llcorehttp/CMakeLists.txt
+++ b/indra/llcorehttp/CMakeLists.txt
@@ -7,7 +7,7 @@ include(GoogleMock)
 include(CURL)
 include(OpenSSL)
 include(NGHTTP2)
-include(ZLIB)
+include(ZLIBNG)
 include(LLCoreHttp)
 include(LLAddBuildTest)
 include(LLMessage)
-- 
cgit v1.2.3


From a212a862b48dbe07e069b87b68a5c202f0b34060 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 27 May 2021 00:04:08 +0300
Subject: SL-15211 SL-14541 Update OpenSSL library

Moving a copy of OpenSSL 1.1.1 to D543 from D520 to have less conflicts with zlib-ng integration later
---
 indra/llcorehttp/httpcommon.cpp | 55 -----------------------------------------
 1 file changed, 55 deletions(-)

(limited to 'indra/llcorehttp')

diff --git a/indra/llcorehttp/httpcommon.cpp b/indra/llcorehttp/httpcommon.cpp
index e37a38b05f..bbf23a6d70 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
@@ -348,34 +337,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 +348,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();
 }
 
-- 
cgit v1.2.3