X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=5eebba5612bd845190bc573fe3d73895e7c60c50;hp=6aa82e448b558c4b4068daaed70c8930d1f1e9e3;hb=65572373b52dad3f2ff3b8302a6f7491553f07b1;hpb=8b2c02c8d6255583982e767374d39375b3380c4d

diff --git a/http_send.c b/http_send.c
index 6aa82e44..5eebba56 100644
--- a/http_send.c
+++ b/http_send.c
@@ -116,7 +116,7 @@ static void http_shutdown_client(struct http_client *hc, const char *msg)
 		hc->fd, msg);
 	numclients--;
 	close(hc->fd);
-
+	del_close_on_fork_list(hc->fd);
 	list_for_each_entry_safe(qp, tmp, &hc->packet_queue, node) {
 		free(qp->packet);
 		list_del(&qp->node);
@@ -124,21 +124,13 @@ static void http_shutdown_client(struct http_client *hc, const char *msg)
 	}
 	list_del(&hc->node);
 	free(hc);
-	return;
 }
 
-static void http_shutdown_clients_real(void)
-{
-	struct http_client *hc, *tmp;
-	list_for_each_entry_safe(hc, tmp, &clients, node)
-		http_shutdown_client(hc, "afs request");
-}
 static void http_shutdown_clients(void)
 {
 	struct http_client *hc, *tmp;
 	list_for_each_entry_safe(hc, tmp, &clients, node)
-		if (hc->status == HTTP_STREAMING)
-			http_shutdown_client(hc, "afs request");
+		http_shutdown_client(hc, "afs request");
 }
 
 static int http_send_msg(struct http_client *hc, const char *msg)
@@ -334,6 +326,8 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
 		CLIENT_ADDR(hc), hc->fd);
 	numclients++;
 	list_add(&hc->node, &clients);
+	add_close_on_fork_list(hc->fd);
+	mark_fd_nonblock(hc->fd);
 	return;
 err_out:
 	PARA_WARNING_LOG("ignoring connect request from %s (%s)\n",
@@ -381,7 +375,7 @@ static int open_tcp_port(int port)
 {
 	server_fd = init_tcp_socket(port);
 	if (server_fd < 0) {
-		http_shutdown_clients_real();
+		http_shutdown_clients();
 		self->status = SENDER_OFF;
 		return server_fd;
 	}
@@ -405,7 +399,7 @@ static int http_com_off(__a_unused struct sender_command_data *scd)
 		del_close_on_fork_list(server_fd);
 		server_fd = -1;
 	}
-	http_shutdown_clients_real();
+	http_shutdown_clients();
 	return 1;
 }