commit 58c163fbf46a6eb7305e22d853f30a5b1dd9a9f1 from: Tracey Emery date: Tue Aug 25 22:49:23 2020 UTC fix inflight count commit - f7da1d2a5961471e94f95cdffaf2671804b604af commit + 58c163fbf46a6eb7305e22d853f30a5b1dd9a9f1 blob - 6758d04c9f3c7d43e60792827bf7cf080cfa823f blob + 6e0499e86b64ecc0cb533aa89b9e3b4254855565 --- thingsd/client.c +++ thingsd/client.c @@ -34,7 +34,7 @@ #define FD_RESERVE 5 #define FD_NEEDED 6 -int cgi_inflight = 0; +volatile int client_inflight = 0; int accept_reserve(int, struct sockaddr *, socklen_t *, int, volatile int *); @@ -89,7 +89,7 @@ client_conn(int fd, short event, void *arg) event_add(sock->ev, NULL); client_fd = accept_reserve(fd, (struct sockaddr *)&ss, &len, FD_RESERVE, - &cgi_inflight); + &client_inflight); if (client_fd == -1) { switch (errno) { case EINTR: @@ -167,7 +167,7 @@ client_conn(int fd, short event, void *arg) return; err: log_debug("%s: client error", __func__); - cgi_inflight--; + client_inflight--; if (client_fd != -1) close(client_fd); if (sock->tls) @@ -255,6 +255,7 @@ client_del(struct thingsd *env, struct client *client) if (pclient->bev != NULL) bufferevent_free(pclient->bev); + client_inflight--; close(pclient->fd); TAILQ_REMOVE(env->clients, pclient, entry); free(pclient->ev);