[GNUnet-SVN] r33874 - in libmicrohttpd: . src/include src/microhttpd

[gnunet]

Author: grothoff
Date: 2014-06-26 21:07:19 +0200 (Thu, 26 Jun 2014)
New Revision: 33874

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/include/microhttpd.h
   libmicrohttpd/src/microhttpd/daemon.c
Log:
fix failure to terminate quickly in thread-per-connection mode if clients have 
open connections

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2014-06-26 17:40:10 UTC (rev 33873)
+++ libmicrohttpd/ChangeLog     2014-06-26 19:07:19 UTC (rev 33874)
@@ -1,3 +1,8 @@
+Thu Jun 26 21:06:04 CEST 2014
+       Fix failure to terminate 'instantly' in thread-per-connection
+       mode if there is a client with open connections.
+       Thanks to Kenneth Mastro for reporting. -CG
+
 Sun Jun 22 12:22:08 CEST 2014
        Actually, avoid locking on response as responses must
        not be modified in a connection-specific way; instead

Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h      2014-06-26 17:40:10 UTC (rev 
33873)
+++ libmicrohttpd/src/include/microhttpd.h      2014-06-26 19:07:19 UTC (rev 
33874)
@@ -130,7 +130,7 @@
  * Current version of the library.
  * 0x01093001 = 1.9.30-1.
  */
-#define MHD_VERSION 0x00093703
+#define MHD_VERSION 0x00093704
 
 /**
  * MHD-internal return code for "YES".

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2014-06-26 17:40:10 UTC (rev 
33873)
+++ libmicrohttpd/src/microhttpd/daemon.c       2014-06-26 19:07:19 UTC (rev 
33874)
@@ -3996,7 +3996,7 @@
   if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) &&
        (MHD_YES != MHD_mutex_lock_ (&daemon->cleanup_connection_mutex)) )
     MHD_PANIC ("Failed to acquire cleanup mutex\n");
-  for (pos = daemon->connections_head; NULL != pos; pos = pos->nextX)
+  for (pos = daemon->connections_head; NULL != pos; pos = pos->next)
     shutdown (pos->socket_fd,
              (pos->read_closed == MHD_YES) ? SHUT_WR : SHUT_RDWR);
   if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) &&