[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37903 - in libmicrohttpd: . src/microhttpd
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37903 - in libmicrohttpd: . src/microhttpd |
Date: |
Wed, 7 Sep 2016 13:17:32 +0200 |
Author: grothoff
Date: 2016-09-07 13:17:32 +0200 (Wed, 07 Sep 2016)
New Revision: 37903
Modified:
libmicrohttpd/ChangeLog
libmicrohttpd/src/microhttpd/daemon.c
Log:
applying Hawk's fix for #4641
Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog 2016-09-06 22:29:11 UTC (rev 37902)
+++ libmicrohttpd/ChangeLog 2016-09-07 11:17:32 UTC (rev 37903)
@@ -1,3 +1,6 @@
+Wed Sep 7 12:57:57 CEST 2016
+ Fixing #4641. -Hawk
+
Wed Sep 7 00:28:59 CEST 2016
Adding remaining "_"-markups for i18n (#4614). -CG
Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c 2016-09-06 22:29:11 UTC (rev
37902)
+++ libmicrohttpd/src/microhttpd/daemon.c 2016-09-07 11:17:32 UTC (rev
37903)
@@ -3187,6 +3187,7 @@
int timeout;
unsigned int poll_count;
int poll_listen;
+ int poll_pipe;
memset (&p,
0,
@@ -3193,6 +3194,7 @@
sizeof (p));
poll_count = 0;
poll_listen = -1;
+ poll_pipe = -1;
if (MHD_INVALID_SOCKET != daemon->socket_fd)
{
p[poll_count].fd = daemon->socket_fd;
@@ -3206,6 +3208,7 @@
p[poll_count].fd = daemon->wpipe[0];
p[poll_count].events = POLLIN;
p[poll_count].revents = 0;
+ poll_pipe = poll_count;
poll_count++;
}
if (MHD_NO == may_block)
@@ -3229,6 +3232,10 @@
#endif
return MHD_NO;
}
+ if ( (-1 != poll_pipe) &&
+ (0 != (p[poll_pipe].revents & POLLIN)) )
+ MHD_pipe_drain_ (daemon->wpipe[0]);
+
/* handle shutdown */
if (MHD_YES == daemon->shutdown)
return MHD_NO;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37903 - in libmicrohttpd: . src/microhttpd,
gnunet <=