Merge branch 'openssl-lock-free'

8aa70737 · Carlos Martín Nieto · ce8822cb · d6ecc311 · 8aa70737
Commit 8aa70737 authored Nov 17, 2014 by Carlos Martín Nieto
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

src/global.c
+6 -0

No files found.
--- a/src/global.c
+++ b/src/global.c
@@ -67,7 +67,13 @@ void openssl_locking_function(int mode, int n, const char *file, int line)

 static void shutdown_ssl_locking(void)
 {
+	int num_locks, i;
+
+	num_locks = CRYPTO_num_locks();
 	CRYPTO_set_locking_callback(NULL);
+
+	for (i = 0; i < num_locks; ++i)
+		git_mutex_free(openssl_locks);
 	git__free(openssl_locks);
 }
 #endif