Ticket #114: lock.patch

src/main.c

@@ -128 +128 @@
 server_info_t info;
 struct in_addr localaddr;
 
+#ifdef HAVE_TLS
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+static pthread_mutex_t *lock_cs;
+void pthreads_locking_callback(int mode, int type, char *file, int line)
+{
+  if(mode & CRYPTO_LOCK)
+    pthread_mutex_lock(&(lock_cs[type]));
+  else
+    pthread_mutex_unlock(&(lock_cs[type]));
+}
+
+unsigned long pthreads_thread_id(void)
+{
+  return (unsigned long)pthread_self();
+}
+#endif
+#endif /* HAVE_TLS */
+
 /*
  * The world starts here.
  * - First initialize the run path and
@@ -157 +175 @@
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
   SSL_library_init();
   SSL_load_error_strings();
+  if((lock_cs = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(pthread_mutex_t))))
+  {
+    int i;
+    for (i = 0; i < CRYPTO_num_locks(); i++)
+      pthread_mutex_init(&(lock_cs[i]), NULL);
+    CRYPTO_set_id_callback((unsigned long (*)())pthreads_thread_id);
+    CRYPTO_set_locking_callback((void (*)())pthreads_locking_callback);
+  }
 #endif
 #endif /* HAVE_TLS */