X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=f0c9851fbe722889a46f12ff39741a7298b5929f;hp=0e7d02415a8cdd70938544c3af66621b05ab630a;hb=9421d244243c0a5c6d3941905abfb0b516781465;hpb=968b72b29cf48bae18ecfccbc68b7c241d3d86f7

diff --git a/http_send.c b/http_send.c
index 0e7d0241..f0c9851f 100644
--- a/http_send.c
+++ b/http_send.c
@@ -38,8 +38,6 @@
 #define HTTP_ERR_MSG "HTTP/1.0 400 Bad Request\n"
 /** \endcond */
 
-extern struct gengetopt_args_info conf;
-
 /** the possible states of a client from the server's POV */
 enum http_status {
 	HTTP_CONNECTED,
@@ -116,7 +114,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);
@@ -326,6 +324,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",