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

[gnunet]

Author: grothoff
Date: 2013-07-19 10:05:35 +0200 (Fri, 19 Jul 2013)
New Revision: 28183

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/microhttpd/daemon.c
Log:
-cleanup connections also if MHD_run_from_select is used

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2013-07-19 07:59:29 UTC (rev 28182)
+++ libmicrohttpd/ChangeLog     2013-07-19 08:05:35 UTC (rev 28183)
@@ -1,4 +1,6 @@
 Fri Jul 19 09:57:27 CEST 2013
+       Fix issue where connections were not cleaned up when
+       'MHD_run_from_select' was used.
        Releasing libmicrohttpd 0.9.28. -CG
 
 Sun Jul 14 19:57:56 CEST 2013

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2013-07-19 07:59:29 UTC (rev 
28182)
+++ libmicrohttpd/src/microhttpd/daemon.c       2013-07-19 08:05:35 UTC (rev 
28183)
@@ -1610,6 +1610,7 @@
          pos->idle_handler (pos);      
         }
     }
+  MHD_cleanup_connections (daemon);
   return MHD_YES;
 }
 
@@ -2153,14 +2154,22 @@
        (0 != (daemon->options & MHD_USE_SELECT_INTERNALLY)) )
     return MHD_NO;
   if (0 != (daemon->options & MHD_USE_POLL)) 
+  {
     MHD_poll (daemon, MHD_NO);    
+    MHD_cleanup_connections (daemon);
+  }
 #if EPOLL_SUPPORT     
   else if (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) 
+  {
     MHD_epoll (daemon, MHD_NO);
+    MHD_cleanup_connections (daemon);
+  }
 #endif
-  else    
+  else
+  { 
     MHD_select (daemon, MHD_NO);    
-  MHD_cleanup_connections (daemon);
+    /* MHD_select does MHD_cleanup_connections already */
+  }
   return MHD_YES;
 }