pollin issue

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 9e8b8f52..e65172a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 23 23:24:25 CET 2011
+        Do not use POLLIN when we only care about POLLHUP (significantly
+        improves performance when using MHD_USE_THREAD_PER_CONNECTION
+        in combination with MHD_USE_POLL). -ES
+
 Sun Mar 20 09:16:53 CET 2011
         Fixing race when using MHD_USE_THREAD_PER_CONNECTION in combination
         with MHD_USE_POLL. -CG
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index b85c8510..a2dbba0e 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -647,7 +647,7 @@ MHD_handle_connection (void *data)
 
           fd = con->daemon->socket_fd;
           p[1].fd = fd;
-          p[1].events |= POLLIN;
+          p[1].events = 0; /* only care about POLLHUP */
           
           if (poll (p, 
                     (fd != -1) ? 2 : 1,