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

[gnunet]

Author: grothoff
Date: 2008-09-10 21:50:35 -0600 (Wed, 10 Sep 2008)
New Revision: 7685

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/README
   libmicrohttpd/configure.ac
   libmicrohttpd/src/daemon/daemon.c
Log:
update

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2008-09-11 03:24:13 UTC (rev 7684)
+++ libmicrohttpd/ChangeLog     2008-09-11 03:50:35 UTC (rev 7685)
@@ -1,3 +1,7 @@
+Wed Sep 10 21:36:06 MDT 2008
+        Fixed data race on closing sockets during 
+        shutdown (in one-thread-per-connection mode). -CG
+
 Thu Sep  4 23:37:18 MDT 2008
         Fixed some boundary issues with processing
         chunked requests; removed memmove from a 

Modified: libmicrohttpd/README
===================================================================
--- libmicrohttpd/README        2008-09-11 03:24:13 UTC (rev 7684)
+++ libmicrohttpd/README        2008-09-11 03:50:35 UTC (rev 7685)
@@ -24,9 +24,10 @@
 default to reduce the size of the library (error messages take
 space!).  If you are concerned about space, you should set "CFLAGS" to
 "-Os -fomit-frame-pointer" to have gcc generate tight code.  The
-resulting binary should be about 25k depending on the platform (I 
-got 25884 bytes using "-march=pentium4").
+resulting binary should be about 30k (without SSL support) depending 
+on the platform.
 
+
 Portability
 ===========
 
@@ -64,16 +65,14 @@
 
 This is a beta release.  Below we list things that should be
 implemented (in order of importance) before we can claim to be
-reasonably complete.  #XXXX refers to the respective Mantis bug report
-(or feature request).
+reasonably complete.
 
 
-
 Missing features:
 =================
-- SSL support:
-  * documentation
-  * more testing
+- SSL code is still too large (plenty of dead or
+  unnecessary code imported from gnuTLS)
+- Make sure SSL works on non-GNU/Linux platforms
 
 
 Untested features:
@@ -87,12 +86,18 @@
   suppressing 100 CONTINUE
 - extend testcase for chunked encoding to validate
   handling of footers
+- more testing for SSL support
 
 
 Missing documentation:
 ======================
-- manual (SSL/TLS support)
+
+- manual:
+  * document configuration options
+  * document SSL/TLS support
+  * document details on porting MHD (plibc, z/OS)
 - tutorial:
   * clean up English
   * make sure everything is accurate
   * change example code to follow GNU coding conventions
+  * provide examples for using SSL

Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac  2008-09-11 03:24:13 UTC (rev 7684)
+++ libmicrohttpd/configure.ac  2008-09-11 03:50:35 UTC (rev 7685)
@@ -21,8 +21,8 @@
 #
 #
 AC_PREREQ(2.57)
-AC_INIT([libmicrohttpd], [0.3.1],address@hidden)
-AM_INIT_AUTOMAKE([libmicrohttpd], [0.3.1])
+AC_INIT([libmicrohttpd], [0.4.0pre0],address@hidden)
+AM_INIT_AUTOMAKE([libmicrohttpd], [0.4.0pre0])
 AM_CONFIG_HEADER([MHD_config.h])
 
 AH_TOP([#define _GNU_SOURCE  1])

Modified: libmicrohttpd/src/daemon/daemon.c
===================================================================
--- libmicrohttpd/src/daemon/daemon.c   2008-09-11 03:24:13 UTC (rev 7684)
+++ libmicrohttpd/src/daemon/daemon.c   2008-09-11 03:50:35 UTC (rev 7685)
@@ -597,32 +597,35 @@
   prev = NULL;
   while (pos != NULL)
     {
-      if (pos->socket_fd == -1)
-        {
+      if ( (pos->socket_fd == -1) ||
+          ( ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) &&
+              (daemon->shutdown) &&
+              (pos->socket_fd != -1) ) ) )
+       {
           if (prev == NULL)
             daemon->connections = pos->next;
           else
-            prev->next = pos->next;
-          if (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION))
-            {
-              pthread_kill (pos->pid, SIGALRM);
-              pthread_join (pos->pid, &unused);
-            }
-          MHD_destroy_response (pos->response);
-          MHD_pool_destroy (pos->pool);
+            prev->next = pos->next;       
+         if (0 != (pos->daemon->options & MHD_USE_THREAD_PER_CONNECTION))
+           {
+             pthread_kill (pos->pid, SIGALRM);
+             pthread_join (pos->pid, &unused);
+           }
+         MHD_destroy_response (pos->response);
+         MHD_pool_destroy (pos->pool);
 #if HTTPS_SUPPORT
-          if (pos->tls_session != NULL)            
-           MHD_gnutls_deinit (pos->tls_session);            
+         if (pos->tls_session != NULL)            
+           MHD_gnutls_deinit (pos->tls_session);
 #endif
-          free (pos->addr);
-          free (pos);
-          daemon->max_connections++;
-          if (prev == NULL)
+         free (pos->addr);
+         free (pos);
+         daemon->max_connections++;
+         if (prev == NULL)
             pos = daemon->connections;
           else
             pos = prev->next;
-          continue;
-        }
+         continue;
+       }
       prev = pos;
       pos = pos->next;
     }