[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r31241 - in libmicrohttpd: . src/include src/microhttpd
From: |
gnunet |
Subject: |
[GNUnet-SVN] r31241 - in libmicrohttpd: . src/include src/microhttpd |
Date: |
Mon, 9 Dec 2013 21:43:13 +0100 |
Author: grothoff
Date: 2013-12-09 21:43:13 +0100 (Mon, 09 Dec 2013)
New Revision: 31241
Modified:
libmicrohttpd/ChangeLog
libmicrohttpd/src/include/microhttpd.h
libmicrohttpd/src/microhttpd/daemon.c
Log:
fixing #3179
Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog 2013-12-09 20:27:32 UTC (rev 31240)
+++ libmicrohttpd/ChangeLog 2013-12-09 20:43:13 UTC (rev 31241)
@@ -1,3 +1,8 @@
+Mon Dec 9 21:41:57 CET 2013
+ Fix for per-worker daemon pipes enabled with
+ MHD_USE_SUSPEND_RESUME that were not closed in
+ MHD_stop_daemon. -MH
+
Sat Dec 7 00:44:49 CET 2013
Fixing warnings and build issue if --disable-https is given
to configure. -CG
Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h 2013-12-09 20:27:32 UTC (rev
31240)
+++ libmicrohttpd/src/include/microhttpd.h 2013-12-09 20:43:13 UTC (rev
31241)
@@ -121,7 +121,7 @@
* Current version of the library.
* 0x01093001 = 1.9.30-1.
*/
-#define MHD_VERSION 0x00093201
+#define MHD_VERSION 0x00093202
/**
* MHD-internal return code for "YES".
Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c 2013-12-09 20:27:32 UTC (rev
31240)
+++ libmicrohttpd/src/microhttpd/daemon.c 2013-12-09 20:43:13 UTC (rev
31241)
@@ -3978,6 +3978,16 @@
(0 != CLOSE (daemon->worker_pool[i].epoll_fd)) )
MHD_PANIC ("close failed\n");
#endif
+ if ( (MHD_USE_SUSPEND_RESUME == (daemon->options &
MHD_USE_SUSPEND_RESUME)) )
+ {
+ if (-1 != daemon->worker_pool[i].wpipe[1])
+ {
+ if (0 != CLOSE (daemon->worker_pool[i].wpipe[0]))
+ MHD_PANIC ("close failed\n");
+ if (0 != CLOSE (daemon->worker_pool[i].wpipe[1]))
+ MHD_PANIC ("close failed\n");
+ }
+ }
}
free (daemon->worker_pool);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r31241 - in libmicrohttpd: . src/include src/microhttpd,
gnunet <=