[GNUnet-SVN] r12479 - in libmicrohttpd: . src/daemon src/examples

[gnunet]

Author: grothoff
Date: 2010-08-06 12:52:44 +0200 (Fri, 06 Aug 2010)
New Revision: 12479

Modified:
   libmicrohttpd/AUTHORS
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/daemon/daemon.c
   libmicrohttpd/src/examples/minimal_example.c
Log:
fixing memory leak

Modified: libmicrohttpd/AUTHORS
===================================================================
--- libmicrohttpd/AUTHORS       2010-08-06 10:51:55 UTC (rev 12478)
+++ libmicrohttpd/AUTHORS       2010-08-06 10:52:44 UTC (rev 12479)
@@ -23,6 +23,7 @@
 Mike Crowe <address@hidden>
 John Muth <address@hidden>
 Geoffrey McRae <address@hidden>
+Piotr Grzybowski <address@hidden>
 
 Documentation contributions also came from:
 Marco Maggi <address@hidden>

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2010-08-06 10:51:55 UTC (rev 12478)
+++ libmicrohttpd/ChangeLog     2010-08-06 10:52:44 UTC (rev 12479)
@@ -1,3 +1,7 @@
+Fri Aug  6 12:51:59 CEST 2010
+       Fixing (small) memory leak on daemon-shutdown with
+       SSL enabled. -CG/PG
+
 Thu Aug  5 22:24:37 CEST 2010
        Fixing timeout bug on systems that think it's still
        1970 (can happen if system time not initialized). -CG

Modified: libmicrohttpd/src/daemon/daemon.c
===================================================================
--- libmicrohttpd/src/daemon/daemon.c   2010-08-06 10:51:55 UTC (rev 12478)
+++ libmicrohttpd/src/daemon/daemon.c   2010-08-06 10:52:44 UTC (rev 12479)
@@ -1938,6 +1938,7 @@
 #if HTTPS_SUPPORT
   if (daemon->options & MHD_USE_SSL)
     {
+      gnutls_priority_deinit (daemon->priority_cache);
       if (daemon->x509_cred)
         gnutls_certificate_free_credentials (daemon->x509_cred);
       /* lock MHD_gnutls_global mutex since it uses reference counting */

Modified: libmicrohttpd/src/examples/minimal_example.c
===================================================================
--- libmicrohttpd/src/examples/minimal_example.c        2010-08-06 10:51:55 UTC 
(rev 12478)
+++ libmicrohttpd/src/examples/minimal_example.c        2010-08-06 10:52:44 UTC 
(rev 12479)
@@ -68,7 +68,9 @@
     }
   d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG,
                         atoi (argv[1]),
-                        NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END);
+                        NULL, NULL, &ahc_echo, PAGE,
+                       MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 5,
+                       MHD_OPTION_END);
   if (d == NULL)
     return 1;
   (void) getc (stdin);