Try to get some more correct curl init into the unit testing.

1 files changed, 77 insertions, 1 deletions

diff --git a/indra/llcorehttp/tests/llcorehttp_test.cpp b/indra/llcorehttp/tests/llcorehttp_test.cpp
index 92f16be8fd..da811adb19 100644
--- a/indra/llcorehttp/tests/llcorehttp_test.cpp
+++ b/indra/llcorehttp/tests/llcorehttp_test.cpp
@@ -24,15 +24,18 @@
  * $/LicenseInfo$
  */
 
+#include "llcorehttp_test.h"
 
 #include <iostream>
 
 // These are not the right way in viewer for some reason:
 // #include <tut/tut.hpp>
 // #include <tut/tut_reporter.hpp>
+// This works:
 #include "../test/lltut.h"
 
 #include <curl/curl.h>
+#include <openssl/crypto.h>
 
 // Pull in each of the test sets
 #include "test_httpstatus.hpp"
@@ -43,7 +46,10 @@
 #include "test_bufferarray.hpp"
 #include "test_httprequestqueue.hpp"
 
-#if 0
+unsigned long ssl_thread_id_callback(void);
+void ssl_locking_callback(int mode, int type, const char * file, int line);
+
+#if 0	// lltut provides main
 
 namespace tut
 {
@@ -65,4 +71,74 @@ int main()
 	curl_global_cleanup();
 }
 
+#endif // 0
+
+int ssl_mutex_count(0);
+LLCoreInt::HttpMutex ** ssl_mutex_list = NULL;
+
+void init_curl()
+{
+	curl_global_init(CURL_GLOBAL_ALL);
+
+	ssl_mutex_count = CRYPTO_num_locks();
+	if (ssl_mutex_count > 0)
+	{
+		ssl_mutex_list = new LLCoreInt::HttpMutex * [ssl_mutex_count];
+		
+		for (int i(0); i < ssl_mutex_count; ++i)
+		{
+			ssl_mutex_list[i] = new LLCoreInt::HttpMutex;
+		}
+
+		CRYPTO_set_locking_callback(ssl_locking_callback);
+		CRYPTO_set_id_callback(ssl_thread_id_callback);
+	}
+}
+
+
+void term_curl()
+{
+	CRYPTO_set_locking_callback(NULL);
+	for (int i(0); i < ssl_mutex_count; ++i)
+	{
+		delete ssl_mutex_list[i];
+	}
+	delete [] ssl_mutex_list;
+}
+
+
+unsigned long ssl_thread_id_callback(void)
+{
+#if defined(WIN32)
+	return (unsigned long) GetCurrentThread();
+#else
+	return (unsigned long) pthread_self();
+#endif
+}
+
+
+void ssl_locking_callback(int mode, int type, const char * /* file */, int /* line */)
+{
+	if (type >= 0 && type < ssl_mutex_count)
+	{
+		if (mode & CRYPTO_LOCK)
+		{
+			ssl_mutex_list[type]->lock();
+		}
+		else
+		{
+			ssl_mutex_list[type]->unlock();
+		}
+	}
+}
+
+
+#if defined(WIN32)
+
+int getopt(int argc, char * const argv[], const char *optstring)
+{
+	return -1;
+}
+
 #endif
+