6 files changed, 45 insertions, 27 deletions

diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index f3aea3db..1ce0accc 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
 
 if HAVE_GNU_LD
 #  If you want to debug with gdb, comment out this line:
-#  retaincommand=-Wl,--retain-symbols-file -Wl,$(srcdir)/SYMBOLS
+  retaincommand=-Wl,--retain-symbols-file -Wl,$(srcdir)/SYMBOLS
 endif
 
 EXTRA_DIST = SYMBOLS
diff --git a/src/daemon/connection.c b/src/daemon/connection.c
index 9a346bc7..3209974d 100644
--- a/src/daemon/connection.c
+++ b/src/daemon/connection.c
@@ -275,12 +275,14 @@ need_100_continue (struct MHD_Connection *connection)
 }
 
 /**
- * A serious error occured, close the
- * connection (and notify the application).
+ * Close the given connection and give the
+ * specified termination code to the user.
  */
-static void
-connection_close_error (struct MHD_Connection *connection)
+void 
+MHD_connection_close (struct MHD_Connection *connection,
+                      enum MHD_RequestTerminationCode termination_code)
 {
+
   SHUTDOWN (connection->socket_fd, SHUT_RDWR);
   CLOSE (connection->socket_fd);
   connection->socket_fd = -1;
@@ -290,7 +292,18 @@ connection_close_error (struct MHD_Connection *connection)
                                           daemon->notify_completed_cls,
                                           connection,
                                           &connection->client_context,
-                                          MHD_REQUEST_TERMINATED_WITH_ERROR);
+                                          termination_code);
+}
+
+/**
+ * A serious error occured, close the
+ * connection (and notify the application).
+ */
+static void
+connection_close_error (struct MHD_Connection *connection)
+{
+  MHD_connection_close(connection,
+                       MHD_REQUEST_TERMINATED_WITH_ERROR);
 }
 
 /**
@@ -1024,6 +1037,10 @@ parse_initial_message_line (struct MHD_Connection *connection, char *line)
       httpVersion[0] = '\0';
       httpVersion++;
     }
+  if (connection->daemon->uri_log_callback != NULL)
+    connection->client_context 
+      = connection->daemon->uri_log_callback(connection->daemon->uri_log_callback_cls,
+                                             uri);
   args = strstr (uri, "?");
   if (args != NULL)
     {
diff --git a/src/daemon/connection.h b/src/daemon/connection.h
index b53f4e74..6cbef165 100644
--- a/src/daemon/connection.h
+++ b/src/daemon/connection.h
@@ -43,8 +43,16 @@ MHD_connection_get_fdset (struct MHD_Connection *connection,
 void MHD_set_http_calbacks (struct MHD_Connection *connection);
 
 int MHD_connection_handle_read (struct MHD_Connection *connection);
+
 int MHD_connection_handle_write (struct MHD_Connection *connection);
+
 int MHD_connection_handle_idle (struct MHD_Connection *connection);
 
+/**
+ * Close the given connection and give the
+ * specified termination code to the user.
+ */
+void MHD_connection_close (struct MHD_Connection *connection,
+                           enum MHD_RequestTerminationCode termination_code);
 
 #endif
diff --git a/src/daemon/connection_https.c b/src/daemon/connection_https.c
index 3ced8602..4bb98595 100644
--- a/src/daemon/connection_https.c
+++ b/src/daemon/connection_https.c
@@ -100,16 +100,8 @@ MHD_tls_connection_close (struct MHD_Connection *connection,
 {
   MHD__gnutls_bye (connection->tls_session, GNUTLS_SHUT_WR);
   connection->tls_session->internals.read_eof = 1;
-  SHUTDOWN (connection->socket_fd, SHUT_RDWR);
-  CLOSE (connection->socket_fd);
-  connection->socket_fd = -1;
-  connection->state = MHD_CONNECTION_CLOSED;
-  if (connection->daemon->notify_completed != NULL)
-    connection->daemon->notify_completed (connection->
-                                          daemon->notify_completed_cls,
-                                          connection,
-                                          &connection->client_context,
-                                          termination_code);
+  MHD_connection_close(connection,
+                       termination_code);
 }
 
 /**
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);
     }
diff --git a/src/daemon/internal.h b/src/daemon/internal.h
index e0514b9a..4d89ac57 100644
--- a/src/daemon/internal.h
+++ b/src/daemon/internal.h
@@ -599,6 +599,10 @@ struct MHD_Daemon
 
   void *notify_completed_cls;
 
+  void * (*uri_log_callback)(void * cls, const char * uri);
+
+  void * uri_log_callback_cls;
+
     /**
      * PID of the select thread (if we have internal select)
      */