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

[gnunet]

Author: grothoff
Date: 2015-12-05 17:31:45 +0100 (Sat, 05 Dec 2015)
New Revision: 36731

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/microhttpd/daemon.c
Log:
aggressively close sockets in multi-threaded operation

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2015-12-05 16:30:51 UTC (rev 36730)
+++ libmicrohttpd/ChangeLog     2015-12-05 16:31:45 UTC (rev 36731)
@@ -1,8 +1,12 @@
+Sat Dec  5 17:30:45 CET 2015
+       Close sockets more aggressively in multi-threaded
+       mode (possibly relevant for idle servers). -CG
+
 Fri Dec  4 13:53:05 CET 2015
        Releasing libmicrohttpd 0.9.47. -CG
 
 Thu Dec  3 18:21:44 CET 2015
-       Reworked VS project files. Used x64 build tools by 
+       Reworked VS project files. Used x64 build tools by
        default, many optimizations, fixes.
        Added project files for VS 2015. -EG
 

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2015-12-05 16:30:51 UTC (rev 
36730)
+++ libmicrohttpd/src/microhttpd/daemon.c       2015-12-05 16:31:45 UTC (rev 
36731)
@@ -1027,7 +1027,15 @@
                                     con,
                                     &con->socket_context,
                                     MHD_CONNECTION_NOTIFY_CLOSED);
-
+  if (MHD_INVALID_SOCKET != con->socket_fd)
+    {
+#ifdef WINDOWS
+      shutdown (con->socket_fd, SHUT_WR);
+#endif
+      if (0 != MHD_socket_close_ (con->socket_fd))
+        MHD_PANIC ("close failed\n");
+      con->socket_fd = MHD_INVALID_SOCKET;
+    }
   return (MHD_THRD_RTRN_TYPE_) 0;
 }