diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-03-05 21:03:21 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-03-05 21:03:21 +0000 |
commit | 30f4e693ce7affab3884e9e8230ff3b989247de9 (patch) | |
tree | 6815cf7e913941624133afa235a45c1a671e18a2 | |
parent | 381be7260e3b53c46ce57d5641b0b95364ab10e5 (diff) | |
download | libmicrohttpd-30f4e693ce7affab3884e9e8230ff3b989247de9.tar.gz libmicrohttpd-30f4e693ce7affab3884e9e8230ff3b989247de9.zip |
fixing 1667
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | src/daemon/daemon.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,7 @@ | |||
1 | Sat Mar 5 22:00:36 CET 2011 | ||
2 | Do not use POLLRDHUP, which causes build errors on OS X / OpenSolaris | ||
3 | (#1667). -CG | ||
4 | |||
1 | Fri Mar 4 10:24:04 CET 2011 | 5 | Fri Mar 4 10:24:04 CET 2011 |
2 | Added new API to allow MHD server to initiate connection to | 6 | Added new API to allow MHD server to initiate connection to |
3 | client (special use-case for servers behind NAT), thereby | 7 | client (special use-case for servers behind NAT), thereby |
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c index 54b73f9b..77444409 100644 --- a/src/daemon/daemon.c +++ b/src/daemon/daemon.c | |||
@@ -650,7 +650,7 @@ MHD_handle_connection (void *data) | |||
650 | 650 | ||
651 | fd = con->daemon->socket_fd; | 651 | fd = con->daemon->socket_fd; |
652 | p[1].fd = fd; | 652 | p[1].fd = fd; |
653 | p[1].events |= POLLIN | POLLRDHUP; | 653 | p[1].events |= POLLIN; |
654 | 654 | ||
655 | if (poll (p, | 655 | if (poll (p, |
656 | (fd != -1) ? 2 : 1, | 656 | (fd != -1) ? 2 : 1, |