morgan/UxPlay
1
0
Fork 0
mirror of https://github.com/morgan9e/UxPlay synced 2026-04-14 00:04:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

httpd.c: avoid race giving socket errors when connection is closed

Browse Source
This commit is contained in:
F. Duncanh
2025-08-30 15:14:58 -04:00
parent 94a7733d7e
commit 8ff22f17ac
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/httpd.c
View File

@@ -201,25 +201,26 @@ httpd_destroy(httpd_t *httpd)
static void static void
httpd_remove_connection(httpd_t *httpd, http_connection_t *connection) httpd_remove_connection(httpd_t *httpd, http_connection_t *connection)
{ {
int socket_fd = connection->socket_fd;
connection->socket_fd = 0;
if (connection->request) { if (connection->request) {
http_request_destroy(connection->request); http_request_destroy(connection->request);
connection->request = NULL; connection->request = NULL;
} }
logger_log(httpd->logger, LOGGER_DEBUG, "removing connection type %s socket %d conn %p", typename[connection->type], logger_log(httpd->logger, LOGGER_DEBUG, "removing connection type %s socket %d conn %p", typename[connection->type],
connection->socket_fd, connection->user_data); socket_fd, connection->user_data);
if (connection->user_data) { if (connection->user_data) {
httpd->callbacks.conn_destroy(connection->user_data); httpd->callbacks.conn_destroy(connection->user_data);
connection->user_data = NULL; connection->user_data = NULL;
} }
if (connection->socket_fd) { if (socket_fd) {
shutdown(connection->socket_fd, SHUT_WR); shutdown(socket_fd, SHUT_WR);
int ret = closesocket(connection->socket_fd); int ret = closesocket(socket_fd);
if (ret == -1) { if (ret == -1) {
logger_log(httpd->logger, LOGGER_ERR, "httpd error in closesocket (close): %d %s", errno, strerror(errno)); logger_log(httpd->logger, LOGGER_ERR, "httpd error in closesocket (close): %d %s", errno, strerror(errno));
} else { } else {
logger_log(httpd->logger, LOGGER_INFO, "Connection closed on socket %d", connection->socket_fd); logger_log(httpd->logger, LOGGER_INFO, "Connection closed on socket %d", socket_fd);
} }
connection->socket_fd = 0;
} }
if (connection->connected) { if (connection->connected) {
connection->connected = 0; connection->connected = 0;
@@ -444,7 +445,7 @@ httpd_thread(void *arg)
logger_log(httpd->logger, LOGGER_DEBUG,"\nhttpd: current connections:"); logger_log(httpd->logger, LOGGER_DEBUG,"\nhttpd: current connections:");
for (int i = 0; i < httpd->max_connections; i++) { for (int i = 0; i < httpd->max_connections; i++) {
http_connection_t *connection = &httpd->connections[i]; http_connection_t *connection = &httpd->connections[i];
if (!connection->connected) { if (!connection->connected || !connection->socket_fd) {
continue; continue;
} }
if (!FD_ISSET(connection->socket_fd, &rfds)) { if (!FD_ISSET(connection->socket_fd, &rfds)) {
@@ -463,7 +464,10 @@ httpd_thread(void *arg)
if (new_request) { if (new_request) {
int readstart = 0; int readstart = 0;
new_request = 0; new_request = 0;
while (readstart < 8 && connection->socket_fd) { while (readstart < 8) {
if (!connection->socket_fd) {
break;
}
ret = recv(connection->socket_fd, buffer + readstart, sizeof(buffer) - 1 - readstart, 0); ret = recv(connection->socket_fd, buffer + readstart, sizeof(buffer) - 1 - readstart, 0);
if (ret == 0) { if (ret == 0) {
logger_log(httpd->logger, LOGGER_DEBUG, "client closed connection on socket %d", logger_log(httpd->logger, LOGGER_DEBUG, "client closed connection on socket %d",