1 files changed, 8 insertions, 11 deletions

diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index 1f85c4b2..40254c00 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -274,9 +274,8 @@ MHD_handle_connection (void *data)
                 "Processing thread terminating, closing connection\n");
 #endif
 #endif
-      SHUTDOWN (con->socket_fd, SHUT_RDWR);
-      CLOSE (con->socket_fd);
-      con->socket_fd = -1;
+      MHD_connection_close(con,
+                           MHD_REQUEST_TERMINATED_DAEMON_SHUTDOWN);
     }
   return NULL;
 }
@@ -871,6 +870,10 @@ MHD_start_daemon_va (unsigned int options,
         case MHD_OPTION_SOCK_ADDR:
           servaddr = va_arg (ap, struct sockaddr *);
           break;
+        case MHD_OPTION_URI_LOG_CALLBACK:
+          retVal->uri_log_callback = va_arg(ap, void* (*)(void * cls, const char* uri));
+          retVal->uri_log_callback_cls = va_arg(ap, void*);
+          break;
 #if HTTPS_SUPPORT
         case MHD_OPTION_PROTOCOL_VERSION:
           _set_priority (&retVal->priority_cache->protocol,
@@ -1065,14 +1068,8 @@ MHD_stop_daemon (struct MHD_Daemon *daemon)
           MHD_DLOG (daemon, "MHD shutdown, closing active connections\n");
 #endif
 #endif
-          if (daemon->notify_completed != NULL)
-            daemon->notify_completed (daemon->notify_completed_cls,
-                                      daemon->connections,
-                                      &daemon->connections->client_context,
-                                      MHD_REQUEST_TERMINATED_DAEMON_SHUTDOWN);
-          SHUTDOWN (daemon->connections->socket_fd, SHUT_RDWR);
-          CLOSE (daemon->connections->socket_fd);
-          daemon->connections->socket_fd = -1;
+          MHD_connection_close(daemon->connections,
+                               MHD_REQUEST_TERMINATED_DAEMON_SHUTDOWN);
         }
       MHD_cleanup_connections (daemon);
     }