1 files changed, 12 insertions, 6 deletions

diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 185421c7..001c3586 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -6234,6 +6234,8 @@ MHD_get_daemon_info (struct MHD_Daemon *daemon,
                      enum MHD_DaemonInfoType info_type,
                      ...)
 {
+  if (NULL == daemon)
+    return NULL;
   switch (info_type)
     {
     case MHD_DAEMON_INFO_KEY_SIZE:
@@ -6247,16 +6249,20 @@ MHD_get_daemon_info (struct MHD_Daemon *daemon,
       return (const union MHD_DaemonInfo *) &daemon->epoll_fd;
 #endif
     case MHD_DAEMON_INFO_CURRENT_CONNECTIONS:
-      MHD_cleanup_connections (daemon);
-      if (daemon->worker_pool)
+      if (0 == (daemon->options & MHD_USE_INTERNAL_POLLING_THREAD))
+        {
+          /* Assume that MHD_run() in not called in other thread
+           * at the same time. */
+          MHD_cleanup_connections (daemon);
+        }
+      else if (daemon->worker_pool)
         {
-          /* Collect the connection information stored in the workers. */
           unsigned int i;
-
+          /* Collect the connection information stored in the workers. */
           daemon->connections = 0;
-          for (i=0;i<daemon->worker_pool_size;i++)
+          for (i = 0; i < daemon->worker_pool_size; i++)
             {
-              MHD_cleanup_connections (&daemon->worker_pool[i]);
+              /* FIXME: next line is thread-safe only if read is atomic. */
               daemon->connections += daemon->worker_pool[i].connections;
             }
         }