revert sendfile()

src/http/http.c

@@ -5,9 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/sendfile.h>
 #include <sys/socket.h>
-#include <sys/stat.h>
 #include <unistd.h>
 
 #include "utils/colors.h"
@@ -216,71 +214,78 @@ void cws_http_send_response(cws_http *request, cws_http_status status) {
 
 int cws_http_send_resource(cws_http *request) {
 	int keepalive = 1;
-	const char *path = mcl_string_cstr(request->location_path);
 
-	/* Open file */
+	FILE *file = fopen(mcl_string_cstr(request->location_path), "rb");
-	int fd = open(path, O_RDONLY);
+	if (file == NULL) {
-	if (fd < 0) {
 		cws_http_send_response(request, CWS_HTTP_NOT_FOUND);
-
 		return 0;
 	}
 
-	struct stat st;
-	if (fstat(fd, &st) < 0) {
-		close(fd);
-		cws_http_send_response(request, CWS_HTTP_NOT_FOUND);
-	}
-	size_t content_length = st.st_size;
-
 	/* Retrieve correct Content-Type */
 	char content_type[1024];
-	if (cws_http_get_content_type(request, content_type) < 0) {
+	int ret = cws_http_get_content_type(request, content_type);
-		close(fd);
+	if (ret < 0) {
+		fclose(file);
 		cws_http_send_response(request, CWS_HTTP_NOT_FOUND);
 		return 0;
 	}
 
-	/* Build header only */
+	/* Retrieve file size */
+	fseek(file, 0, SEEK_END);
+	const size_t content_length = ftell(file);
+	rewind(file);
+
+	/* Retrieve file data */
+	char *file_data = malloc(content_length);
+	if (file_data == NULL) {
+		fclose(file);
+		CWS_LOG_ERROR("Unable to allocate file data");
+		return 0;
+	}
+
+	/* Read file data */
+	size_t read_bytes = fread(file_data, 1, content_length, file);
+	fclose(file);
+
+	if (read_bytes != content_length) {
+		free(file_data);
+		CWS_LOG_ERROR("Partial read from file");
+
+		return 0;
+	}
+
+	/* Check for keep-alive */
 	char conn[32] = "keep-alive";
-	mcl_bucket *hb = mcl_hm_get(request->headers, "Connection");
+	mcl_bucket *connection = mcl_hm_get(request->headers, "Connection");
-	if (hb && strcmp((char *)hb->value, "close")) {
+	if (connection && strcmp((char *)connection->value, "keep-alive") == 0) {
+		strcpy(conn, "keep-alive");
 		keepalive = 0;
-		strncpy(conn, "close", sizeof(conn));
 	}
-	mcl_hm_free_bucket(hb);
+	mcl_hm_free_bucket(connection);
 
-	char *header = NULL;
+	char *response = NULL;
-	size_t header_len = cws_http_response_builder(&header, "HTTP/1.1", CWS_HTTP_OK, content_type, conn, NULL, content_length);
+	size_t response_len = cws_http_response_builder(&response, "HTTP/1.1", CWS_HTTP_OK, content_type, conn, file_data, content_length);
-	if (!header_len) {
-		close(fd);
 
-		return keepalive;
+	/* Send response in chunks to avoid blocking */
-	}
+	size_t bytes_sent = 0;
+	ssize_t sent;
+	const size_t chunk_size = 8192;
 
-	/* Send headers */
+	while (bytes_sent < response_len) {
-	size_t sent = 0;
+		size_t to_send = (response_len - bytes_sent > chunk_size) ? chunk_size : (response_len - bytes_sent);
-	while (sent < header_len) {
+		sent = send(request->sockfd, response + bytes_sent, to_send, MSG_NOSIGNAL);
-		ssize_t n = send(request->sockfd, header + sent, header_len - sent, MSG_NOSIGNAL);
+
-		if (n <= 0) {
+		if (sent <= 0) {
-			if (errno == EAGAIN || errno == EWOULDBLOCK) continue;
+			if (errno == EAGAIN || errno == EWOULDBLOCK) {
-			break;
+				continue;
-		}
+			}
-		sent += n;
-	}
-	free(header);
-
-	/* Zero-copy sendfile */
-	off_t offset = 0;
-	while (offset < (off_t)content_length) {
-		ssize_t n = sendfile(request->sockfd, fd, &offset, content_length - offset);
-		if (n <= 0) {
-			if (errno == EAGAIN || errno == EWOULDBLOCK) continue;
 			break;
 		}
+		bytes_sent += sent;
 	}
 
-	close(fd);
+	free(response);
+	free(file_data);
 
 	return keepalive;
 }

src/server/server.c

@@ -4,7 +4,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <netinet/in.h>
-#include <signal.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/epoll.h>
@@ -33,9 +32,6 @@ static void cws_server_setup_hints(struct addrinfo *hints, const char *hostname)
 }
 
 cws_server_ret cws_server_start(cws_config *config) {
-	/* Ignore SIGPIPE so a write/sendfile to a closed peer doesn't terminate the process */
-	signal(SIGPIPE, SIG_IGN);
-
 	if (!config || !config->hostname || !config->port) {
 		return CWS_SERVER_CONFIG;
 	}

src/server/worker.c

@@ -88,12 +88,12 @@ void cws_worker_free(cws_worker **workers, size_t workers_num) {
 
 void *cws_worker_loop(void *arg) {
 	cws_worker *worker = arg;
-	struct epoll_event events[32];
+	struct epoll_event events[64];
 
 	int nfds;
 
 	while (cws_server_run) {
-		nfds = epoll_wait(worker->epfd, events, 32, 1000);
+		nfds = epoll_wait(worker->epfd, events, 64, 1000);
 		if (nfds == 0) {
 			continue;
 		}
@@ -103,13 +103,13 @@ void *cws_worker_loop(void *arg) {
 				/* Handle new client */
 				int client_fd;
 				read(worker->pipefd[0], &client_fd, sizeof(int));
-				CWS_LOG_DEBUG("Data from main, add client: %d", client_fd);
+				// CWS_LOG_DEBUG("Data from main, add client: %d", client_fd);
 				cws_fd_set_nonblocking(client_fd);
 				cws_epoll_add(worker->epfd, client_fd, EPOLLIN | EPOLLET);
 			} else {
 				/* Handle client data */
 				int client_fd = events[i].data.fd;
-				CWS_LOG_DEBUG("Data from client (thread: %ld)", worker->thread);
+				// CWS_LOG_DEBUG("Data from client (thread: %ld)", worker->thread);
 				cws_server_handle_client_data(worker->epfd, client_fd, worker->clients, worker->config);
 			}
 		}