[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32311 - libmicrohttpd/src/microhttpd
From: |
gnunet |
Subject: |
[GNUnet-SVN] r32311 - libmicrohttpd/src/microhttpd |
Date: |
Tue, 11 Feb 2014 17:44:27 +0100 |
Author: grothoff
Date: 2014-02-11 17:44:27 +0100 (Tue, 11 Feb 2014)
New Revision: 32311
Modified:
libmicrohttpd/src/microhttpd/daemon.c
Log:
Patch from Karlson2k: fix MHD_get_fdset to accept NULL as max_fd, as described
in
doxy
Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c 2014-02-11 16:32:11 UTC (rev
32310)
+++ libmicrohttpd/src/microhttpd/daemon.c 2014-02-11 16:44:27 UTC (rev
32311)
@@ -593,7 +593,6 @@
|| (NULL == read_fd_set)
|| (NULL == write_fd_set)
|| (NULL == except_fd_set)
- || (NULL == max_fd)
|| (MHD_YES == daemon->shutdown)
|| (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION))
|| (0 != (daemon->options & MHD_USE_POLL)))
@@ -607,7 +606,7 @@
if (daemon->epoll_fd >= FD_SETSIZE)
return MHD_NO; /* poll fd too big, fail hard */
FD_SET (daemon->epoll_fd, read_fd_set);
- if ((*max_fd) < daemon->epoll_fd)
+ if ( (NULL != max_fd) && (*max_fd) < daemon->epoll_fd) )
*max_fd = daemon->epoll_fd;
return MHD_YES;
}
@@ -617,7 +616,7 @@
{
FD_SET (fd, read_fd_set);
/* update max file descriptor */
- if ((*max_fd) < fd)
+ if ( (NULL != max_fd) && ((*max_fd) < fd))
*max_fd = fd;
}
for (pos = daemon->connections_head; NULL != pos; pos = pos->next)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r32311 - libmicrohttpd/src/microhttpd,
gnunet <=