X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fhttpd.c;h=f081c5e65cc74eb4c10f8ac7ad2818a50cffc73f;hb=ac9240fa569df5a10d534a4cd45740a44ee00f63;hp=7606933696e1cb8548dc57e326bd346221a831d5;hpb=870f342f5de7311f7895f2ca96a8bdd7df20e046;p=deb_shairplay.git

diff --git a/src/lib/httpd.c b/src/lib/httpd.c
index 7606933..f081c5e 100644
--- a/src/lib/httpd.c
+++ b/src/lib/httpd.c
@@ -36,8 +36,6 @@ struct httpd_s {
 	logger_t *logger;
 	httpd_callbacks_t callbacks;
 
-	int use_rtsp;
-
 	int max_connections;
 	int open_connections;
 	http_connection_t *connections;
@@ -54,7 +52,7 @@ struct httpd_s {
 };
 
 httpd_t *
-httpd_init(logger_t *logger, httpd_callbacks_t *callbacks, int max_connections, int use_rtsp)
+httpd_init(logger_t *logger, httpd_callbacks_t *callbacks, int max_connections)
 {
 	httpd_t *httpd;
 
@@ -68,7 +66,6 @@ httpd_init(logger_t *logger, httpd_callbacks_t *callbacks, int max_connections,
 		return NULL;
 	}
 
-	httpd->use_rtsp = !!use_rtsp;
 	httpd->max_connections = max_connections;
 	httpd->connections = calloc(max_connections, sizeof(http_connection_t));
 	if (!httpd->connections) {
@@ -240,7 +237,8 @@ httpd_thread(void *arg)
 				continue;
 			}
 		}
-		if (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;
@@ -260,7 +258,7 @@ httpd_thread(void *arg)
 
 			/* If not in the middle of request, allocate one */
 			if (!connection->request) {
-				connection->request = http_request_init(httpd->use_rtsp);
+				connection->request = http_request_init();
 				assert(connection->request);
 			}
 
@@ -307,10 +305,17 @@ httpd_thread(void *arg)
 						}
 						written += ret;
 					}
+
+					if (http_response_get_disconnect(response)) {
+						logger_log(httpd->logger, LOGGER_INFO, "Disconnecting on software request");
+						httpd_remove_connection(httpd, connection);
+					}
 				} else {
 					logger_log(httpd->logger, LOGGER_INFO, "Didn't get response");
 				}
 				http_response_destroy(response);
+			} else {
+				logger_log(httpd->logger, LOGGER_DEBUG, "Request not complete, waiting for more data...");
 			}
 		}
 	}
@@ -326,6 +331,16 @@ httpd_thread(void *arg)
 		httpd_remove_connection(httpd, connection);
 	}
 
+	/* Close server sockets since they are not used any more */
+	if (httpd->server_fd4 != -1) {
+		closesocket(httpd->server_fd4);
+		httpd->server_fd4 = -1;
+	}
+	if (httpd->server_fd6 != -1) {
+		closesocket(httpd->server_fd6);
+		httpd->server_fd6 = -1;
+	}
+
 	logger_log(httpd->logger, LOGGER_INFO, "Exiting HTTP thread");
 
 	return 0;