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

[gnunet]

Author: grothoff
Date: 2015-08-04 13:52:05 +0200 (Tue, 04 Aug 2015)
New Revision: 36201

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

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2015-08-04 10:42:57 UTC (rev 36200)
+++ libmicrohttpd/ChangeLog     2015-08-04 11:52:05 UTC (rev 36201)
@@ -1,3 +1,9 @@
+Tue Aug  4 13:50:23 CEST 2015
+       Fix failure to properly clean up timed out connections
+       if running in external select mode without listen socket,
+       which caused busy waiting until new connections arrived.
+       (Fixes #3924, thanks to slimp for reporting and testcase). -CG
+
 Sun Aug  2 19:08:20 CEST 2015
        Ignore close() errors on sockets except for EBADF,
        fixes #3926. -CG

Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h      2015-08-04 10:42:57 UTC (rev 
36200)
+++ libmicrohttpd/src/include/microhttpd.h      2015-08-04 11:52:05 UTC (rev 
36201)
@@ -130,7 +130,7 @@
  * Current version of the library.
  * 0x01093001 = 1.9.30-1.
  */
-#define MHD_VERSION 0x00094207
+#define MHD_VERSION 0x00094208
 
 /**
  * MHD-internal return code for "YES".

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2015-08-04 10:42:57 UTC (rev 
36200)
+++ libmicrohttpd/src/microhttpd/daemon.c       2015-08-04 11:52:05 UTC (rev 
36201)
@@ -2351,8 +2351,6 @@
       timeout.tv_sec = ltimeout / 1000;
       tv = &timeout;
     }
-  if (MHD_INVALID_SOCKET == max)
-    return MHD_YES;
   num_ready = MHD_SYS_select_ (max + 1, &rs, &ws, &es, tv);
   if (MHD_YES == daemon->shutdown)
     return MHD_NO;