X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=http_send.c;h=c6b9decca941489c82b629982ddb6d6dbdb2ea33;hb=f1164756a9ce8f61b12060a48b84977f24d9e2b3;hp=4d612285aeff00f7d8d153be5c9f1743f3fa9425;hpb=e2167286448ce2ed9a01a548e7e9832563035088;p=paraslash.git diff --git a/http_send.c b/http_send.c index 4d612285..c6b9decc 100644 --- a/http_send.c +++ b/http_send.c @@ -80,6 +80,7 @@ static void http_shutdown(void) { http_shutdown_clients(); generic_acl_deplete(&hss->acl); + free_sender_status(hss); } static int queue_chunk_or_shutdown(struct sender_client *sc, @@ -198,10 +199,13 @@ static void http_post_select(fd_set *rfds, __a_unused fd_set *wfds) static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds) { struct sender_client *sc, *tmp; + unsigned n; - if (hss->listen_fd < 0) - return; - para_fd_set(hss->listen_fd, rfds, max_fileno); + FOR_EACH_LISTEN_FD(n, hss) { + if (hss->listen_fds[n] < 0) + continue; + para_fd_set(hss->listen_fds[n], rfds, max_fileno); + } list_for_each_entry_safe(sc, tmp, &hss->client_list, node) { struct private_http_sender_data *phsd = sc->private_data; if (phsd->status == HTTP_CONNECTED) /* need to recv get request */ @@ -248,6 +252,7 @@ static char *http_status(void) static void http_send_init(void) { init_sender_status(hss, OPT_RESULT(HTTP_ACCESS), + OPT_RESULT(HTTP_LISTEN_ADDRESS), OPT_UINT32_VAL(HTTP_PORT), OPT_UINT32_VAL(HTTP_MAX_CLIENTS), OPT_GIVEN(HTTP_DEFAULT_DENY)); if (OPT_GIVEN(HTTP_NO_AUTOSTART))