From: Juho Vähä-Herttua <juhovh@iki.fi>
Date: Mon, 24 Mar 2014 18:35:29 +0000 (+0200)
Subject: Fix #23 on issue tracker.
X-Git-Tag: upstream/0.9.0~4^2~8
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=ac9240fa569df5a10d534a4cd45740a44ee00f63;p=deb_shairplay.git

Fix #23 on issue tracker.

There is a race condition if IPv4 and IPv6 connections come at the same time.
---

diff --git a/src/lib/httpd.c b/src/lib/httpd.c
index 1d9e7e2..f081c5e 100644
--- a/src/lib/httpd.c
+++ b/src/lib/httpd.c
@@ -237,7 +237,8 @@ httpd_thread(void *arg)
 				continue;
 			}
 		}
-		if (httpd->server_fd6 != -1 && FD_ISSET(httpd->server_fd6, &rfds)) {
+		if (httpd->open_connections < httpd->max_connections &&
+		    httpd->server_fd6 != -1 && FD_ISSET(httpd->server_fd6, &rfds)) {
 			ret = httpd_accept_connection(httpd, httpd->server_fd6, 1);
 			if (ret == -1) {
 				break;