libmicrohttpd

commit 7f1881553fb52c97a4cfe0e08f559f9774f69c52
parent e762e3cdcca0014608a956f9f5db8f1775195181
Author: Christian Grothoff <christian@grothoff.org>
Date:   Fri, 13 Nov 2009 14:54:47 +0000

call init/deinit earlier

Diffstat:
M
src/daemon/daemon.c
 | 
4
++--
M
src/daemon/https/tls/gnutls_global.c
 | 
6
+++---

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
@@ -1201,7 +1201,6 @@ MHD_start_daemon_va (unsigned int options,
 #endif
           mhd_panic (mhd_panic_cls, __FILE__, __LINE__, NULL);
 	}
-      MHD__gnutls_global_init ();
       if (0 != pthread_mutex_unlock (&MHD_gnutls_init_mutex))
 	{
 #if HAVE_MESSAGES
@@ -1688,7 +1687,6 @@ MHD_stop_daemon (struct MHD_Daemon *daemon)
 #endif
 	  abort();
 	}
-      MHD__gnutls_global_deinit ();
       if (0 != pthread_mutex_unlock (&MHD_gnutls_init_mutex))
 	{
 #if HAVE_MESSAGES
@@ -1797,6 +1795,7 @@ void ATTRIBUTE_CONSTRUCTOR MHD_init ()
   plibc_init ("GNU", "libmicrohttpd");
 #endif
 #if HTTPS_SUPPORT
+  MHD__gnutls_global_init ();
   if (0 != pthread_mutex_init(&MHD_gnutls_init_mutex, NULL))
     abort();
 #endif
@@ -1805,6 +1804,7 @@ void ATTRIBUTE_CONSTRUCTOR MHD_init ()
 void ATTRIBUTE_DESTRUCTOR MHD_fini ()
 {
 #if HTTPS_SUPPORT
+  MHD__gnutls_global_deinit ();
   if (0 != pthread_mutex_destroy(&MHD_gnutls_init_mutex))
     mhd_panic (mhd_panic_cls, __FILE__, __LINE__, NULL);
 #endif
diff --git a/src/daemon/https/tls/gnutls_global.c b/src/daemon/https/tls/gnutls_global.c
@@ -127,7 +127,7 @@ static int MHD__gnutls_init_level = 0;
  *
  **/
 int
-MHD__gnutls_global_init (void)
+MHD__gnutls_global_init ()
 {
   int result = 0;
   int res;
@@ -160,7 +160,7 @@ MHD__gnutls_global_init (void)
   }
 #endif
 
-  // bindtextdomain("mhd", "./");
+  /* bindtextdomain("mhd", "./"); */
 
   if (gcry_control (GCRYCTL_ANY_INITIALIZATION_P) == 0)
     {
@@ -242,7 +242,7 @@ MHD__gnutls_global_init (void)
  *
  **/
 void
-MHD__gnutls_global_deinit (void)
+MHD__gnutls_global_deinit ()
 {
   if (MHD__gnutls_init_level == 1)
     {