[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r9493 - in libmicrohttpd/src/daemon: . https/tls
From: |
gnunet |
Subject: |
[GNUnet-SVN] r9493 - in libmicrohttpd/src/daemon: . https/tls |
Date: |
Fri, 13 Nov 2009 07:54:47 -0700 |
Author: grothoff
Date: 2009-11-13 07:54:47 -0700 (Fri, 13 Nov 2009)
New Revision: 9493
Modified:
libmicrohttpd/src/daemon/daemon.c
libmicrohttpd/src/daemon/https/tls/gnutls_global.c
Log:
call init/deinit earlier
Modified: libmicrohttpd/src/daemon/daemon.c
===================================================================
--- libmicrohttpd/src/daemon/daemon.c 2009-11-13 14:54:35 UTC (rev 9492)
+++ libmicrohttpd/src/daemon/daemon.c 2009-11-13 14:54:47 UTC (rev 9493)
@@ -1201,7 +1201,6 @@
#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 @@
#endif
abort();
}
- MHD__gnutls_global_deinit ();
if (0 != pthread_mutex_unlock (&MHD_gnutls_init_mutex))
{
#if HAVE_MESSAGES
@@ -1797,6 +1795,7 @@
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_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
Modified: libmicrohttpd/src/daemon/https/tls/gnutls_global.c
===================================================================
--- libmicrohttpd/src/daemon/https/tls/gnutls_global.c 2009-11-13 14:54:35 UTC
(rev 9492)
+++ libmicrohttpd/src/daemon/https/tls/gnutls_global.c 2009-11-13 14:54:47 UTC
(rev 9493)
@@ -127,7 +127,7 @@
*
**/
int
-MHD__gnutls_global_init (void)
+MHD__gnutls_global_init ()
{
int result = 0;
int res;
@@ -160,7 +160,7 @@
}
#endif
- // bindtextdomain("mhd", "./");
+ /* bindtextdomain("mhd", "./"); */
if (gcry_control (GCRYCTL_ANY_INITIALIZATION_P) == 0)
{
@@ -242,7 +242,7 @@
*
**/
void
-MHD__gnutls_global_deinit (void)
+MHD__gnutls_global_deinit ()
{
if (MHD__gnutls_init_level == 1)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r9493 - in libmicrohttpd/src/daemon: . https/tls,
gnunet <=