X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=4d612285aeff00f7d8d153be5c9f1743f3fa9425;hp=fb9fd9b3d1b42a1f3841ef88e261178e66efc302;hb=e2167286448ce2ed9a01a548e7e9832563035088;hpb=b0ec08945c28e35558ed85691b57f314724f7613

diff --git a/http_send.c b/http_send.c
index fb9fd9b3..4d612285 100644
--- a/http_send.c
+++ b/http_send.c
@@ -16,13 +16,14 @@
 #include "error.h"
 #include "string.h"
 #include "afh.h"
+#include "net.h"
 #include "server.h"
 #include "http.h"
 #include "list.h"
 #include "send.h"
 #include "sched.h"
 #include "vss.h"
-#include "net.h"
+#include "close_on_fork.h"
 #include "fd.h"
 #include "chunk_queue.h"
 
@@ -75,6 +76,12 @@ static void http_shutdown_clients(void)
 	shutdown_clients(hss);
 }
 
+static void http_shutdown(void)
+{
+	http_shutdown_clients();
+	generic_acl_deplete(&hss->acl);
+}
+
 static int queue_chunk_or_shutdown(struct sender_client *sc,
 		struct sender_status *ss, const char *buf, size_t num_bytes)
 {
@@ -207,7 +214,8 @@ static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
 
 static int http_com_on(__a_unused struct sender_command_data *scd)
 {
-	return generic_com_on(hss, IPPROTO_TCP);
+	generic_com_on(hss, IPPROTO_TCP);
+	return 1;
 }
 
 static int http_com_off(__a_unused struct sender_command_data *scd)
@@ -239,16 +247,12 @@ static char *http_status(void)
  */
 static void http_send_init(void)
 {
-	int ret;
-
 	init_sender_status(hss, OPT_RESULT(HTTP_ACCESS),
 		OPT_UINT32_VAL(HTTP_PORT), OPT_UINT32_VAL(HTTP_MAX_CLIENTS),
 		OPT_GIVEN(HTTP_DEFAULT_DENY));
 	if (OPT_GIVEN(HTTP_NO_AUTOSTART))
 		return;
-	ret = generic_com_on(hss, IPPROTO_TCP);
-	if (ret < 0)
-		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+	generic_com_on(hss, IPPROTO_TCP);
 }
 
 /**
@@ -264,7 +268,7 @@ static void http_send_init(void)
 const struct sender http_sender = {
 	.name = "http",
 	.init = http_send_init,
-	.shutdown = http_shutdown_clients,
+	.shutdown = http_shutdown,
 	.pre_select = http_pre_select,
 	.post_select = http_post_select,
 	.send = http_send,