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

[gnunet]

Author: grothoff
Date: 2015-11-10 15:27:57 +0100 (Tue, 10 Nov 2015)
New Revision: 36652

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/include/microhttpd.h
   libmicrohttpd/src/microhttpd/daemon.c
Log:

Hi folks,

I guess i found a problem with suspended connections. There is a
scenarion where one can resume a connection and then stop the daemon
without gives the daemon the oportunity to really resume the connection.
In this case, microhttpd will abort telling one that there is suspended
connection (because the connection is still in the daemon's suspended
list).

The following patch solves the problem (i've this problem using external
mainloop).

Regards,
Flavio Ceolin


Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2015-11-09 09:41:26 UTC (rev 36651)
+++ libmicrohttpd/ChangeLog     2015-11-10 14:27:57 UTC (rev 36652)
@@ -1,3 +1,7 @@
+Tue Nov 10 15:25:48 CET 2015
+       Fix issue with shutdown if connection was resumed just
+       before shutdown. -FC
+
 Fri Nov  6 22:54:38 CET 2015
        Fixing the buffer shrinkage issue, this time with test. -CG
         Releasing libmicrohttpd 0.9.46. -CG

Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h      2015-11-09 09:41:26 UTC (rev 
36651)
+++ libmicrohttpd/src/include/microhttpd.h      2015-11-10 14:27:57 UTC (rev 
36652)
@@ -130,7 +130,7 @@
  * Current version of the library.
  * 0x01093001 = 1.9.30-1.
  */
-#define MHD_VERSION 0x00094601
+#define MHD_VERSION 0x00094602
 
 /**
  * MHD-internal return code for "YES".

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2015-11-09 09:41:26 UTC (rev 
36651)
+++ libmicrohttpd/src/microhttpd/daemon.c       2015-11-10 14:27:57 UTC (rev 
36652)
@@ -4489,6 +4489,9 @@
 
   if (NULL == daemon)
     return;
+
+  if (0 != (MHD_USE_SUSPEND_RESUME & daemon->options))
+    resume_suspended_connections (daemon);
   daemon->shutdown = MHD_YES;
   fd = daemon->socket_fd;
   daemon->socket_fd = MHD_INVALID_SOCKET;