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

[gnunet]

Author: grothoff
Date: 2015-09-22 19:21:33 +0200 (Tue, 22 Sep 2015)
New Revision: 36369

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/doc/libmicrohttpd.texi
   libmicrohttpd/src/include/microhttpd.h
   libmicrohttpd/src/microhttpd/daemon.c
Log:
help systemd by not calling shutdown() on listen socket if 
MHD_USE_PIPE_FOR_SHUTDOWN is given

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2015-09-22 01:47:36 UTC (rev 36368)
+++ libmicrohttpd/ChangeLog     2015-09-22 17:21:33 UTC (rev 36369)
@@ -1,3 +1,7 @@
+Tue Sep 22 19:17:54 CEST 2015
+       Do not use shutdown() on listen socket if MHD_USE_PIPE_FOR_SHUTDOWN
+       is set. -CG
+
 Wed Sep 16 11:06:02 CEST 2015
        Releasing libmicrohttpd 0.9.43. -CG
 

Modified: libmicrohttpd/doc/libmicrohttpd.texi
===================================================================
--- libmicrohttpd/doc/libmicrohttpd.texi        2015-09-22 01:47:36 UTC (rev 
36368)
+++ libmicrohttpd/doc/libmicrohttpd.texi        2015-09-22 17:21:33 UTC (rev 
36369)
@@ -542,6 +542,10 @@
 specify it), if @code{MHD_USE_NO_LISTEN_SOCKET} is specified.  In
 "external" select mode, this option is always simply ignored.
 
+Using this option also guarantees that MHD will not call
address@hidden()} on the listen socket, which means a parent
+process can continue to use the socket.
+
 @item MHD_USE_SUSPEND_RESUME
 Enables using @code{MHD_suspend_connection} and
 @code{MHD_resume_connection}, as performing these calls requires some

Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h      2015-09-22 01:47:36 UTC (rev 
36368)
+++ libmicrohttpd/src/include/microhttpd.h      2015-09-22 17:21:33 UTC (rev 
36369)
@@ -130,7 +130,7 @@
  * Current version of the library.
  * 0x01093001 = 1.9.30-1.
  */
-#define MHD_VERSION 0x00094300
+#define MHD_VERSION 0x00094301
 
 /**
  * MHD-internal return code for "YES".

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2015-09-22 01:47:36 UTC (rev 
36368)
+++ libmicrohttpd/src/microhttpd/daemon.c       2015-09-22 17:21:33 UTC (rev 
36369)
@@ -2223,7 +2223,7 @@
   struct MHD_Connection *next;
   unsigned int mask = MHD_USE_SUSPEND_RESUME | 
MHD_USE_EPOLL_INTERNALLY_LINUX_ONLY |
     MHD_USE_SELECT_INTERNALLY | MHD_USE_POLL_INTERNALLY | 
MHD_USE_THREAD_PER_CONNECTION;
- 
+
   /* Resuming external connections when using an extern mainloop  */
   if (MHD_USE_SUSPEND_RESUME == (daemon->options & mask))
     resume_suspended_connections (daemon);
@@ -4500,7 +4500,8 @@
   else
     {
       /* fd might be MHD_INVALID_SOCKET here due to 'MHD_quiesce_daemon' */
-      if (MHD_INVALID_SOCKET != fd)
+      if ( (MHD_INVALID_SOCKET != fd) &&
+           (0 == (daemon->options & MHD_USE_PIPE_FOR_SHUTDOWN)) )
        (void) shutdown (fd, SHUT_RDWR);
     }
 #endif